Merge lp:~laney/indicator-keyboard/lp1627057 into lp:indicator-keyboard

[Iain Lane]

Don't clobber unity-settings-daemon's configured input sources when migrating from old configurations

See bug #1627057. I don't understand why this happens now, or why it would be linked to parts of the session being started by systemd, but it seems like i-keyboard is clobbering the values that u-s-d sets up.

[Iain Lane (laney)]

(Self approving the MP, since none of the usual suspects are around today and I think this is important to have in the image. Sorry if this breaks things...)

review: Approve

=== modified file 'lib/main.vala'
--- lib/main.vala	2016-08-03 15:12:49 +0000
+++ lib/main.vala	2016-10-09 13:26:05 +0000
@@ -433,9 +433,26 @@
 			user_list.get_user_by_name ("");
 		} else {
 			if (!indicator_settings.get_boolean ("migrated")) {
+				string[] seen_sources = {};
 				var builder = new VariantBuilder (new VariantType ("a(ss)"));
 				var length = 0;
 
+				foreach (var pair in source_settings.get_value ("sources")) {
+					unowned string source_type;
+					unowned string source_name;
+
+					((!) pair).get ("(&s&s)", out source_type, out source_name);
+
+					if (source_name in seen_sources)
+						continue;
+
+					builder.add ("(ss)", source_type, source_name);
+
+					seen_sources += source_name;
+
+					length++;
+				}
+
 				var layout_settings = new Settings ("org.gnome.libgnomekbd.keyboard");
 				var layouts = layout_settings.get_strv ("layouts");
 
@@ -444,7 +461,13 @@
 					source = source.replace (" ", "+");
 					source = source.replace ("\t", "+");
 
+					if (source in seen_sources)
+						continue;
+
 					builder.add ("(ss)", "xkb", source);
+
+					seen_sources += source;
+
 					length++;
 				}