Merge lp:~attente/indicator-keyboard/lightdm-layout-fallback into lp:indicator-keyboard

[William Hua]

Fall-back on old unity-greeter keyboard layouts in case migration hasn't occurred.

indicator-keyboard should fall-back on the old unity-greeter keyboard layouts in the case that their layouts haven't yet been migrated into accountsservice (this can potentially happen if they haven't done an upgrade in a long time).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/22/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-keyboard-ci/22/rebuild

review: Approve (continuous-integration)

[lp:~attente/indicator-keyboard/lightdm-layout-fallback]

120. By William Hua on 2013-09-21

Always add the default layout.

121. By William Hua on 2013-09-21

Prevent index out of bounds.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:121
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/23/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-keyboard-ci/23/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Code looks good to me and is working. Thanks!

review: Approve

=== modified file 'lib/main.vala'
--- lib/main.vala	2013-08-29 02:22:25 +0000
+++ lib/main.vala	2013-09-21 16:21:16 +0000
@@ -41,6 +41,8 @@
 	private MenuModel? menu_model;
 	private Menu? sources_menu;
 
+	private uint lightdm_current;
+
 	[DBus (visible = false)]
 	public Service (ref unowned string[] args) {
 		force = "--force" in args;
@@ -112,7 +114,9 @@
 	[DBus (visible = false)]
 	private void migrate_keyboard_layouts () {
 		if (is_login_user ()) {
-			Act.UserManager manager = Act.UserManager.get_default ();
+			lightdm_current = source_settings.get_uint ("current");
+
+			var manager = Act.UserManager.get_default ();
 
 			if (manager.is_loaded) {
 				users = manager.list_users ();
@@ -147,6 +151,15 @@
 					}
 				});
 			}
+
+			var user_list = LightDM.UserList.get_instance ();
+
+			user_list.user_added.connect ((user) => { migrate_input_sources (); });
+			user_list.user_changed.connect ((user) => { migrate_input_sources (); });
+			user_list.user_removed.connect ((user) => { migrate_input_sources (); });
+
+			/* Force the loading of the user list. */
+			user_list.get_user_by_name ("");
 		} else {
 			if (!indicator_settings.get_boolean ("migrated")) {
 				var builder = new VariantBuilder (new VariantType ("a(ss)"));
@@ -209,12 +222,12 @@
 
 		foreach (var user in users) {
 			if (user.is_loaded) {
-				var sources = user.input_sources;
-				var layouts = user.xkeyboard_layouts;
+				var done = false;
 
 				VariantIter outer;
 				VariantIter inner;
 
+				var sources = user.input_sources;
 				sources.get ("aa{ss}", out outer);
 
 				while (outer.next ("a{ss}", out inner)) {
@@ -223,31 +236,76 @@
 
 					while (inner.next ("{&s&s}", out key, out source)) {
 						if (key == "xkb") {
-							if (!added.contains (source)) {
-								list.add (source);
-								added.add (source);
-							}
-						}
-					}
-				}
-
-				foreach (var layout in layouts) {
-					var source = layout;
-					source = source.replace (" ", "+");
-					source = source.replace ("\t", "+");
-
-					if (!added.contains (source)) {
-						list.add (source);
-						added.add (source);
+							done = true;
+
+							if (!added.contains (source)) {
+								list.add (source);
+								added.add (source);
+							}
+						}
+					}
+				}
+
+				if (!done) {
+					var layouts = user.xkeyboard_layouts;
+					foreach (var layout in layouts) {
+						done = true;
+
+						var source = layout;
+						source = source.replace (" ", "+");
+						source = source.replace ("\t", "+");
+
+						if (!added.contains (source)) {
+							list.add (source);
+							added.add (source);
+						}
+					}
+				}
+
+				if (!done) {
+					var user_list = LightDM.UserList.get_instance ();
+					LightDM.User? light_user = user_list.get_user_by_name (user.user_name);
+
+					if (light_user != null) {
+						var layouts = ((!) light_user).get_layouts ();
+						foreach (var layout in layouts) {
+							done = true;
+
+							var source = layout;
+							source = source.replace (" ", "+");
+							source = source.replace ("\t", "+");
+
+							if (!added.contains (source)) {
+								list.add (source);
+								added.add (source);
+							}
+						}
 					}
 				}
 			}
 		}
 
+		var layout = LightDM.get_layout ();
+
+		var source = layout.name;
+		source = source.replace (" ", "+");
+		source = source.replace ("\t", "+");
+
+		if (!added.contains (source)) {
+			list.add (source);
+			added.add (source);
+		}
+
 		var builder = new VariantBuilder (new VariantType ("a(ss)"));
 
-		foreach (var layout in list) {
-			builder.add ("(ss)", "xkb", layout);
+		foreach (var name in list) {
+			builder.add ("(ss)", "xkb", name);
+		}
+
+		if (lightdm_current < list.size) {
+			source_settings.set_uint ("current", lightdm_current);
+		} else {
+			source_settings.set_uint ("current", list.size - 1);
 		}
 
 		source_settings.set_value ("sources", builder.end ());

=== modified file 'po/indicator-keyboard.pot'
--- po/indicator-keyboard.pot	2013-08-29 02:22:25 +0000
+++ po/indicator-keyboard.pot	2013-09-21 16:21:16 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-29 10:20+0800\n"
+"POT-Creation-Date: 2013-09-20 20:56-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"