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

Proposed by William Hua
Status: Merged
Approved by: Ted Gould
Approved revision: 133
Merged at revision: 133
Proposed branch: lp:~attente/indicator-keyboard/lp1226962
Merge into: lp:indicator-keyboard
Diff against target: 48 lines (+20/-18)
1 file modified
lib/main.vala (+20/-18)
To merge this branch: bzr merge lp:~attente/indicator-keyboard/lp1226962
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+190163@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

Makes sense to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
436436
437 [DBus (visible = false)]437 [DBus (visible = false)]
438 private void update_login_layout () {438 private void update_login_layout () {
439 unowned List<LightDM.Layout> layouts = LightDM.get_layouts ();439 if (is_login_user ()) {
440 var current = source_settings.get_uint ("current");440 unowned List<LightDM.Layout> layouts = LightDM.get_layouts ();
441441 var current = source_settings.get_uint ("current");
442 if (current < get_sources ().length) {442
443 var source = get_sources ()[current];443 if (current < get_sources ().length) {
444 string? name = null;444 var source = get_sources ()[current];
445445 string? name = null;
446 if (source.layout != null && source.variant != null) {446
447 name = @"$((!) source.layout)\t$((!) source.variant)";447 if (source.layout != null && source.variant != null) {
448 } else if (source.layout != null) {448 name = @"$((!) source.layout)\t$((!) source.variant)";
449 name = source.layout;449 } else if (source.layout != null) {
450 }450 name = source.layout;
451451 }
452 if (name != null) {452
453 foreach (var layout in layouts) {453 if (name != null) {
454 if (layout.name == (!) name) {454 foreach (var layout in layouts) {
455 LightDM.set_layout (layout);455 if (layout.name == (!) name) {
456 break;456 LightDM.set_layout (layout);
457 break;
458 }
457 }459 }
458 }460 }
459 }461 }

Subscribers

People subscribed via source and target branches

to all changes: