Merge lp:~larsu/indicator-sound/dont-write-settings-on-startup into lp:indicator-sound/14.04

[Lars Karlitski]

Don't write 'interested-media-players' on startup

IndicatorSound.Service read that gsettings key and inserted the players desktop ids into a MediaPlayerList, which emits "player-added" every time a player is added. This patch makes the service keep track of whether players are added because it is syncing the key or when a player appeared on the bus.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:407
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/86/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/25/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/86/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Nice fix!

review: Approve

[Sebastien Bacher (seb128)]

(confirmed that the login write is not happening with that version)

review: Approve

=== modified file 'src/service.vala'
--- src/service.vala	2014-01-03 18:42:54 +0000
+++ src/service.vala	2014-01-15 16:12:32 +0000
@@ -42,9 +42,9 @@
 			this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE);
 		});
 
-		this.players.sync (settings.get_strv ("interested-media-players"));
+		this.sync_preferred_players ();
 		this.settings.changed["interested-media-players"].connect ( () => {
-			this.players.sync (settings.get_strv ("interested-media-players"));
+			this.sync_preferred_players ();
 		});
 
 		if (settings.get_boolean ("show-notify-osd-on-scroll")) {
@@ -86,6 +86,7 @@
 	MediaPlayerList players;
 	uint player_action_update_id;
 	Notify.Notification notification;
+	bool syncing_preferred_players = false;
 
 	const double volume_step_percentage = 0.06;
 
@@ -281,11 +282,21 @@
 			this.player_action_update_id = Idle.add (this.update_player_actions);
 	}
 
+
+	void sync_preferred_players () {
+		this.syncing_preferred_players = true;
+		this.players.sync (settings.get_strv ("interested-media-players"));
+		this.syncing_preferred_players = false;
+	}
+
 	void update_preferred_players () {
-		var builder = new VariantBuilder (VariantType.STRING_ARRAY);
-		foreach (var player in this.players)
-			builder.add ("s", player.id);
-		this.settings.set_value ("interested-media-players", builder.end ());
+		/* only write the key if we're not getting this call because we're syncing from the key right now */
+		if (!this.syncing_preferred_players) {
+			var builder = new VariantBuilder (VariantType.STRING_ARRAY);
+			foreach (var player in this.players)
+				builder.add ("s", player.id);
+			this.settings.set_value ("interested-media-players", builder.end ());
+		}
 	}
 
 	void player_added (MediaPlayer player) {