Align with trunk to prepare for landing there

8 files changed, 215 insertions, 35 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3cab736..c18726c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -104,12 +104,20 @@ vala_add(indicator-sound-service
     media-player
     mpris2-interfaces
     accounts-service-sound-settings
+    accounts-service-privacy-settings
+    accounts-service-system-sound-settings
     greeter-broadcast
 )
 vala_add(indicator-sound-service
   accounts-service-sound-settings.vala
 )
 vala_add(indicator-sound-service
+  accounts-service-privacy-settings.vala
+)
+vala_add(indicator-sound-service
+  accounts-service-system-sound-settings.vala
+)
+vala_add(indicator-sound-service
   greeter-broadcast.vala
 )
 
diff --git a/src/accounts-service-privacy-settings.vala b/src/accounts-service-privacy-settings.vala
new file mode 100644
index 0000000..ef5c309
--- /dev/null
+++ b/src/accounts-service-privacy-settings.vala
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 © Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Ted Gould <ted@canonical.com>
+ */
+
+[DBus (name = "com.ubuntu.touch.AccountsService.SecurityPrivacy")]
+public interface AccountsServicePrivacySettings : Object {
+	// properties 
+	public abstract bool stats_welcome_screen {owned get; set;}
+	public abstract bool messages_welcome_screen {owned get; set;}
+}
+
diff --git a/src/accounts-service-system-sound-settings.vala b/src/accounts-service-system-sound-settings.vala
new file mode 100644
index 0000000..283a606
--- /dev/null
+++ b/src/accounts-service-system-sound-settings.vala
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 © Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Ted Gould <ted@canonical.com>
+ */
+
+[DBus (name = "com.ubuntu.touch.AccountsService.Sound")]
+public interface AccountsServiceSystemSoundSettings : Object {
+	// properties 
+	public abstract bool silent_mode {owned get; set;}
+}
+
diff --git a/src/accounts-service-user.vala b/src/accounts-service-user.vala
index 04c38cc..ec52730 100644
--- a/src/accounts-service-user.vala
+++ b/src/accounts-service-user.vala
@@ -21,10 +21,25 @@ public class AccountsServiceUser : Object {
 	Act.UserManager accounts_manager = Act.UserManager.get_default();
 	Act.User? user = null;
 	AccountsServiceSoundSettings? proxy = null;
+	AccountsServicePrivacySettings? privacyproxy = null;
+	AccountsServiceSystemSoundSettings? syssoundproxy = null;
 	uint timer = 0;
 	MediaPlayer? _player = null;
 	GreeterBroadcast? greeter = null;
 
+	public bool showDataOnGreeter { get; set; }
+
+	bool _silentMode = false;
+	public bool silentMode {
+		get {
+			return _silentMode;
+		}
+		set {
+			if (syssoundproxy != null)
+				syssoundproxy.silent_mode = value;
+		}
+	}
+
 	public MediaPlayer? player {
 		set {
 			this._player = value;
@@ -124,7 +139,23 @@ public class AccountsServiceUser : Object {
 				user.get_object_path(),
 				DBusProxyFlags.GET_INVALIDATED_PROPERTIES,
 				null,
-				new_proxy);
+				new_sound_proxy);
+
+			Bus.get_proxy.begin<AccountsServicePrivacySettings> (
+				BusType.SYSTEM,
+				"org.freedesktop.Accounts",
+				user.get_object_path(),
+				DBusProxyFlags.GET_INVALIDATED_PROPERTIES,
+				null,
+				new_privacy_proxy);
+
+			Bus.get_proxy.begin<AccountsServiceSystemSoundSettings> (
+				BusType.SYSTEM,
+				"org.freedesktop.Accounts",
+				user.get_object_path(),
+				DBusProxyFlags.GET_INVALIDATED_PROPERTIES,
+				null,
+				new_system_sound_proxy);
 		}
 	}
 
@@ -138,7 +169,7 @@ public class AccountsServiceUser : Object {
 		}
 	}
 
-	void new_proxy (GLib.Object? obj, AsyncResult res) {
+	void new_sound_proxy (GLib.Object? obj, AsyncResult res) {
 		try {
 			this.proxy = Bus.get_proxy.end (res);
 			this.player = _player;
@@ -148,6 +179,45 @@ public class AccountsServiceUser : Object {
 		}
 	}
 
+	void new_privacy_proxy (GLib.Object? obj, AsyncResult res) {
+		try {
+			this.privacyproxy = Bus.get_proxy.end (res);
+
+			(this.privacyproxy as DBusProxy).g_properties_changed.connect((proxy, changed, invalid) => {
+				var welcomeval = changed.lookup_value("MessagesWelcomeScreen", new VariantType("b"));
+				if (welcomeval != null) {
+					debug("Messages on welcome screen changed");
+					this.showDataOnGreeter = welcomeval.get_boolean();
+				}
+			});
+
+			this.showDataOnGreeter = this.privacyproxy.messages_welcome_screen;
+		} catch (Error e) {
+			this.privacyproxy = null;
+			warning("Unable to get proxy to user privacy settings: %s", e.message);
+		}
+	}
+
+	void new_system_sound_proxy (GLib.Object? obj, AsyncResult res) {
+		try {
+			this.syssoundproxy = Bus.get_proxy.end (res);
+
+			(this.syssoundproxy as DBusProxy).g_properties_changed.connect((proxy, changed, invalid) => {
+				var silentvar = changed.lookup_value("SilentMode", new VariantType("b"));
+				if (silentvar != null) {
+					debug("Silent Mode changed");
+					this._silentMode = silentvar.get_boolean();
+					this.notify_property("silentMode");
+				}
+			});
+
+			this.silentMode = this.syssoundproxy.silent_mode;
+		} catch (Error e) {
+			this.syssoundproxy = null;
+			warning("Unable to get proxy to system sound settings: %s", e.message);
+		}
+	}
+
 	void greeter_proxy_new (GLib.Object? obj, AsyncResult res) {
 		try {
 			this.greeter = Bus.get_proxy.end (res);
diff --git a/src/media-player-mpris.vala b/src/media-player-mpris.vala
index 25ddac4..bf25e21 100644
--- a/src/media-player-mpris.vala
+++ b/src/media-player-mpris.vala
@@ -283,7 +283,7 @@ public class MediaPlayerMpris: MediaPlayer {
 			this.fetch_playlists ();
 	}
 
-	void update_current_track (Variant metadata) {
+	void update_current_track (Variant? metadata) {
 		if (metadata != null) {
 			this.current_track = new Track (
 				sanitize_metadata_value (metadata.lookup_value ("xesam:artist", null)),
diff --git a/src/service.vala b/src/service.vala
index 0a5725a..fa8bbdc 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -27,22 +27,35 @@ public class IndicatorSound.Service: Object {
 
 		this.volume_control = new VolumeControl ();
 
+		/* If we're on the greeter, don't export */
+		if (GLib.Environment.get_user_name() != "lightdm") {
+			this.accounts_service = new AccountsServiceUser();
+
+			this.accounts_service.notify["showDataOnGreeter"].connect(() => {
+				this.export_to_accounts_service = this.accounts_service.showDataOnGreeter;
+				eventually_update_player_actions();
+			});
+
+			this.export_to_accounts_service = this.accounts_service.showDataOnGreeter;
+		}
+
 		this.players = playerlist;
 		this.players.player_added.connect (this.player_added);
 		this.players.player_removed.connect (this.player_removed);
 
 		this.actions = new SimpleActionGroup ();
 		this.actions.add_action_entries (action_entries, this);
+		this.actions.add_action (this.create_silent_mode_action ());
 		this.actions.add_action (this.create_mute_action ());
 		this.actions.add_action (this.create_volume_action ());
 		this.actions.add_action (this.create_mic_volume_action ());
 		this.actions.add_action (this.create_high_volume_actions ());
 
 		this.menus = new HashTable<string, SoundMenu> (str_hash, str_equal);
-		this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS));
-		this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
+		this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS));
+		this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_SILENT_MODE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS));
 		this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE));
-		this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
+		this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.SHOW_SILENT_MODE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
 
 		this.menus.@foreach ( (profile, menu) => {
 			this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE);
@@ -52,10 +65,6 @@ public class IndicatorSound.Service: Object {
 			this.volume_control.bind_property ("high-volume", menu, "show-high-volume-warning", BindingFlags.SYNC_CREATE);
 		});
 
-		/* Setup handling for the greeter-export setting */
-		this.settings.changed["greeter-export"].connect( () => this.build_accountsservice() );
-		build_accountsservice();
-
 		this.sync_preferred_players ();
 		this.settings.changed["interested-media-players"].connect ( () => {
 			this.sync_preferred_players ();
@@ -79,25 +88,8 @@ public class IndicatorSound.Service: Object {
 		}
 	}
 
-	void build_accountsservice () {
-		clear_acts_player();
-		this.accounts_service = null;
-
-		/* If we're not exporting, don't build anything */
-		if (!this.settings.get_boolean("greeter-export")) {
-			debug("Accounts service export disabled due to user setting");
-			return;
-		}
-
-		/* If we're on the greeter, don't export */
-		if (GLib.Environment.get_user_name() == "lightdm") {
-			debug("Accounts service export disabled due to being used on the greeter");
-			return;
-		}
-
-		this.accounts_service = new AccountsServiceUser();
-
-		this.eventually_update_player_actions();
+	bool greeter_show_track () {
+		return export_to_accounts_service;
 	}
 
 	void clear_acts_player () {
@@ -175,6 +167,7 @@ public class IndicatorSound.Service: Object {
 	Notify.Notification notification;
 	bool syncing_preferred_players = false;
 	AccountsServiceUser? accounts_service = null;
+	bool export_to_accounts_service = false;
 
 	/* Maximum volume as a scaling factor between the volume action's state and the value in
 	 * this.volume_control. See create_volume_action().
@@ -275,6 +268,36 @@ public class IndicatorSound.Service: Object {
 		root_action.set_state (builder.end());
 	}
 
+	Action create_silent_mode_action () {
+		bool silentNow = false;
+		if (this.accounts_service != null) {
+			silentNow = this.accounts_service.silentMode;
+		}
+
+		var silent_action = new SimpleAction.stateful ("silent-mode", null, new Variant.boolean (silentNow));
+
+		/* If we're not dealing with accounts service, we'll just always be out
+		   of silent mode and that's cool. */
+		if (this.accounts_service == null) {
+			return silent_action;
+		}
+
+		this.accounts_service.notify["silentMode"].connect(() => {
+			silent_action.set_state(new Variant.boolean(this.accounts_service.silentMode));
+			this.update_root_icon ();
+		});
+
+		silent_action.activate.connect ((action, param) => {
+			action.change_state (new Variant.boolean (!action.get_state().get_boolean()));
+		});
+
+		silent_action.change_state.connect ((action, val) => {
+			this.accounts_service.silentMode = val.get_boolean();
+		});
+
+		return silent_action;
+	}
+
 	Action create_mute_action () {
 		var mute_action = new SimpleAction.stateful ("mute", null, new Variant.boolean (this.volume_control.mute));
 
@@ -398,11 +421,11 @@ public class IndicatorSound.Service: Object {
 		this.loop.quit ();
 	}
 
-	Variant action_state_for_player (MediaPlayer player) {
+	Variant action_state_for_player (MediaPlayer player, bool show_track = true) {
 		var builder = new VariantBuilder (new VariantType ("a{sv}"));
 		builder.add ("{sv}", "running", new Variant ("b", player.is_running));
 		builder.add ("{sv}", "state", new Variant ("s", player.state));
-		if (player.current_track != null) {
+		if (player.current_track != null && show_track) {
 			builder.add ("{sv}", "title", new Variant ("s", player.current_track.title));
 			builder.add ("{sv}", "artist", new Variant ("s", player.current_track.artist));
 			builder.add ("{sv}", "album", new Variant ("s", player.current_track.album));
@@ -421,8 +444,14 @@ public class IndicatorSound.Service: Object {
 				action.set_enabled (player.can_raise);
 			}
 			
+			SimpleAction? greeter_action = this.actions.lookup_action (player.id + ".greeter") as SimpleAction;
+			if (greeter_action != null) {
+				greeter_action.set_state (this.action_state_for_player (player, greeter_show_track()));
+				greeter_action.set_enabled (player.can_raise);
+			}
+			
 			/* If we're playing then put that data in accounts service */
-			if (player.is_running && accounts_service != null) {
+			if (player.is_running && export_to_accounts_service && accounts_service != null) {
 				accounts_service.player = player;
 				clear_accounts_player = false;
 			}
@@ -465,6 +494,11 @@ public class IndicatorSound.Service: Object {
 		action.activate.connect ( () => { player.activate (); });
 		this.actions.add_action (action);
 
+		SimpleAction greeter_action = new SimpleAction.stateful (player.id + ".greeter", null, this.action_state_for_player (player, greeter_show_track()));
+		greeter_action.set_enabled (player.can_raise);
+		greeter_action.activate.connect ( () => { player.activate (); });
+		this.actions.add_action (greeter_action);
+
 		var play_action = new SimpleAction.stateful ("play." + player.id, null, player.state);
 		play_action.activate.connect ( () => player.play_pause () );
 		this.actions.add_action (play_action);
diff --git a/src/sound-menu.vala b/src/sound-menu.vala
index b93c513..a9efd74 100644
--- a/src/sound-menu.vala
+++ b/src/sound-menu.vala
@@ -23,7 +23,9 @@ public class SoundMenu: Object
 		NONE = 0,
 		SHOW_MUTE = 1,
 		HIDE_INACTIVE_PLAYERS = 2,
-		HIDE_PLAYERS = 4
+		HIDE_PLAYERS = 4,
+		GREETER_PLAYERS = 8,
+		SHOW_SILENT_MODE = 16
 	}
 
 	public SoundMenu (string? settings_action, DisplayFlags flags) {
@@ -33,8 +35,15 @@ public class SoundMenu: Object
 		 */
 
 		this.volume_section = new Menu ();
+
 		if ((flags & DisplayFlags.SHOW_MUTE) != 0)
 			volume_section.append (_("Mute"), "indicator.mute");
+		if ((flags & DisplayFlags.SHOW_SILENT_MODE) != 0) {
+			var item = new MenuItem(_("Silent Mode"), "indicator.silent-mode");
+			item.set_attribute("x-canonical-type", "s", "com.canonical.indicator.switch");
+			volume_section.append_item(item);
+		}
+
 		volume_section.append_item (this.create_slider_menu_item (_("Volume"), "indicator.volume(0)", 0.0, 1.0, 0.01,
 																  "audio-volume-low-zero-panel",
 																  "audio-volume-high-panel"));
@@ -59,6 +68,8 @@ public class SoundMenu: Object
 		this.hide_players = (flags & DisplayFlags.HIDE_PLAYERS) != 0;
 		this.hide_inactive = (flags & DisplayFlags.HIDE_INACTIVE_PLAYERS) != 0;
 		this.notify_handlers = new HashTable<MediaPlayer, ulong> (direct_hash, direct_equal);
+
+		this.greeter_players = (flags & DisplayFlags.GREETER_PLAYERS) != 0;
 	}
 
 	public void export (DBusConnection connection, string object_path) {
@@ -172,6 +183,7 @@ public class SoundMenu: Object
 	bool hide_inactive;
 	bool hide_players = false;
 	HashTable<MediaPlayer, ulong> notify_handlers;
+	bool greeter_players = false;
 
 	/* returns the position in this.menu of the section that's associated with @player */
 	int find_player_section (MediaPlayer player) {
@@ -205,7 +217,11 @@ public class SoundMenu: Object
 		if (icon == null)
 			icon = new ThemedIcon.with_default_fallbacks ("application-default-icon");
 
-		var player_item = new MenuItem (player.name, "indicator." + player.id);
+		var base_action = "indicator." + player.id;
+		if (this.greeter_players)
+			base_action += ".greeter";
+
+		var player_item = new MenuItem (player.name, base_action);
 		player_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.media-player");
 		if (icon != null)
 			player_item.set_attribute_value ("icon", icon.serialize ());
diff --git a/src/volume-control.vala b/src/volume-control.vala
index 9114d01..6f48c5d 100644
--- a/src/volume-control.vala
+++ b/src/volume-control.vala
@@ -586,7 +586,8 @@ public class VolumeControl : Object
 
 	bool set_volume_internal (double volume)
 	{
-		return_val_if_fail (context.get_state () == Context.State.READY, false);
+		if (context.get_state () != Context.State.READY)
+			return false;
 
 		if (_volume != volume) {
 			_volume = volume;