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
701
		}
701
		}
6
702
702
7
703
		var builder = new VariantBuilder (new VariantType ("a{sv}"));
703
		var builder = new VariantBuilder (new VariantType ("a{sv}"));
9
704
		builder.add ("{sv}", "visible", indicator_settings.get_value ("visible"));
704
		builder.add ("{sv}", "visible", new Variant.boolean
10
705
				    (indicator_settings.get_boolean ("visible") && sources.length > 1));
11
705
		if (name != null) {
706
		if (name != null) {
12
706
			var description = _ ("%s input source").printf ((!) name);
707
			var description = _ ("%s input source").printf ((!) name);
13
707
			builder.add ("{sv}", "accessible-desc", new Variant.string (description));
708
			builder.add ("{sv}", "accessible-desc", new Variant.string (description));
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
elementary OS team		2014-10-19	Pending
Review via email: mp+238815@code.launchpad.net
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	701	}	701	}
6	702		702
7	703	var builder = new VariantBuilder (new VariantType ("a{sv}"));	703	var builder = new VariantBuilder (new VariantType ("a{sv}"));
9	704	builder.add ("{sv}", "visible", indicator_settings.get_value ("visible"));	704	builder.add ("{sv}", "visible", new Variant.boolean
10			705	(indicator_settings.get_boolean ("visible") && sources.length > 1));
11	705	if (name != null) {	706	if (name != null) {
12	706	var description = _ ("%s input source").printf ((!) name);	707	var description = _ ("%s input source").printf ((!) name);
13	707	builder.add ("{sv}", "accessible-desc", new Variant.string (description));	708	builder.add ("{sv}", "accessible-desc", new Variant.string (description));