Merge lp:~attente/indicator-keyboard/1256559 into lp:indicator-keyboard

[William Hua]

Do not set org.gnome.desktop.input-sources.current when unchanged (LP: #1256559).

Do not set org.gnome.desktop.input-sources.current when unchanged (LP: #1256559).

[William Hua (attente)]

Tested and does seem to prevent unnecessary dconf writes.

review: Approve

=== modified file 'lib/main.vala'
--- lib/main.vala	2014-02-20 16:16:26 +0000
+++ lib/main.vala	2014-02-24 17:02:42 +0000
@@ -513,16 +513,22 @@
 
 	[DBus (visible = false)]
 	private void handle_focused_window_changed (uint window_id, string app_id, uint stage) {
-		((!) window_sources)[focused_window_id] = source_settings.get_uint ("current");
+		var old_current = source_settings.get_uint ("current");
+
+		((!) window_sources)[focused_window_id] = old_current;
 
 		if (!(((!) window_sources).has_key (window_id))) {
 			var default_group = per_window_settings.get_int ("default-group");
 
-			if (default_group >= 0) {
+			if (default_group >= 0 && default_group != old_current) {
 				source_settings.set_uint ("current", (uint) default_group);
 			}
 		} else {
-			source_settings.set_uint ("current", ((!) window_sources)[window_id]);
+			var current = ((!) window_sources)[window_id];
+
+			if (current != old_current) {
+				source_settings.set_uint ("current", current);
+			}
 		}
 
 		focused_window_id = window_id;