elementary OS

Merge lp:~elementary-apps/elementaryos/fix-always-visible-keyboard-indicator into lp:~elementary-os/elementaryos/os-patch-indicator-keyboard-trusty

  1. fix-always-visible-keyboard-indicator
  2. Merge into os-patch-indicator-keyboar...
Proposed by Raphael Isemann
Status: Merged
Merged at revision: 7
Proposed branch: lp:~elementary-apps/elementaryos/fix-always-visible-keyboard-indicator
Merge into: lp:~elementary-os/elementaryos/os-patch-indicator-keyboard-trusty
Diff against target: 13 lines (+2/-1)
1 file modified
lib/main.vala (+2/-1)
To merge this branch: bzr merge lp:~elementary-apps/elementaryos/fix-always-visible-keyboard-indicator
Reviewer Review Type Date Requested Status
elementary OS team Pending
Review via email: mp+238815@code.launchpad.net

Commit message

Indicator now hides if only one layout is available.

Description of the change

Indicator now hides if only one layout is available.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/main.vala'
2--- lib/main.vala 2014-08-25 23:53:55 +0000
3+++ lib/main.vala 2014-10-19 08:50:26 +0000
4@@ -701,7 +701,8 @@
5 }
6
7 var builder = new VariantBuilder (new VariantType ("a{sv}"));
8- builder.add ("{sv}", "visible", indicator_settings.get_value ("visible"));
9+ builder.add ("{sv}", "visible", new Variant.boolean
10+ (indicator_settings.get_boolean ("visible") && sources.length > 1));
11 if (name != null) {
12 var description = _ ("%s input source").printf ((!) name);
13 builder.add ("{sv}", "accessible-desc", new Variant.string (description));

Subscribers

People subscribed via source and target branches