From 96ba3bfeba7badbce1a5f3592f6317a5657a324f Mon Sep 17 00:00:00 2001
From: William Hua <william.hua@canonical.com>
Date: Wed, 9 Oct 2013 11:23:21 -0400
Subject: Don't set LightDM's layout if we're in a session. (LP: 1226962)

---
 lib/main.vala | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'lib')

diff --git a/lib/main.vala b/lib/main.vala
index 190276f8..195ee140 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -436,24 +436,26 @@ public class Indicator.Keyboard.Service : Object {
 
 	[DBus (visible = false)]
 	private void update_login_layout () {
-		unowned List<LightDM.Layout> layouts = LightDM.get_layouts ();
-		var current = source_settings.get_uint ("current");
+		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 (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 (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 (name != null) {
+					foreach (var layout in layouts) {
+						if (layout.name == (!) name) {
+							LightDM.set_layout (layout);
+							break;
+						}
 					}
 				}
 			}
-- 
cgit v1.2.3