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

[William Hua]

Don't set LightDM's layout if we're in a session. (LP: 1226962)

Don't set LightDM's layout if we're in a session. (LP: 1226962)

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-keyboard-ci/31/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

Makes sense to me.

review: Approve

=== modified file 'lib/main.vala'
--- lib/main.vala	2013-10-02 18:53:12 +0000
+++ lib/main.vala	2013-10-09 15:25:40 +0000
@@ -436,24 +436,26 @@
 
 	[DBus (visible = false)]
 	private void update_login_layout () {
-		unowned List<LightDM.Layout> layouts = LightDM.get_layouts ();
-		var current = source_settings.get_uint ("current");
-
-		if (current < get_sources ().length) {
-			var source = get_sources ()[current];
-			string? name = null;
-
-			if (source.layout != null && source.variant != null) {
-				name = @"$((!) source.layout)\t$((!) source.variant)";
-			} else if (source.layout != null) {
-				name = source.layout;
-			}
-
-			if (name != null) {
-				foreach (var layout in layouts) {
-					if (layout.name == (!) name) {
-						LightDM.set_layout (layout);
-						break;
+		if (is_login_user ()) {
+			unowned List<LightDM.Layout> layouts = LightDM.get_layouts ();
+			var current = source_settings.get_uint ("current");
+
+			if (current < get_sources ().length) {
+				var source = get_sources ()[current];
+				string? name = null;
+
+				if (source.layout != null && source.variant != null) {
+					name = @"$((!) source.layout)\t$((!) source.variant)";
+				} else if (source.layout != null) {
+					name = source.layout;
+				}
+
+				if (name != null) {
+					foreach (var layout in layouts) {
+						if (layout.name == (!) name) {
+							LightDM.set_layout (layout);
+							break;
+						}
 					}
 				}
 			}