Indicator keyboard

Merge lp:~jbicha/indicator-keyboard/vala38 into lp:indicator-keyboard

  1. vala38
  2. Merge into trunk
Proposed by Jeremy Bicha on 2017-12-12
Status: Merged
Approved by: Jeremy Bicha on 2017-12-13
Approved revision: 1382
Merged at revision: 1382
Proposed branch: lp:~jbicha/indicator-keyboard/vala38
Merge into: lp:indicator-keyboard
Diff against target: 21 lines (+2/-2)
1 file modified
lib/main.vala (+2/-2)
To merge this branch: bzr merge lp:~jbicha/indicator-keyboard/vala38
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2017-12-12 Pending
Review via email: mp+335107@code.launchpad.net

Commit Message

Fix build with vala 0.38

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 2017-09-06 10:02:24 +0000
3+++ lib/main.vala 2017-12-12 21:46:55 +0000
4@@ -19,7 +19,7 @@
5 [DBus (name = "com.canonical.indicator.keyboard")]
6 public class Indicator.Keyboard.Service : Object {
7
8- private static const uint PROPERTIES_DELAY = 250;
9+ private const uint PROPERTIES_DELAY = 250;
10
11 private static Service service;
12
13@@ -143,7 +143,7 @@
14 per_window_settings.changed["group-per-window"].connect (handle_changed_group_per_window);
15
16 var sss = SettingsSchemaSource.get_default();
17- if (sss.lookup("com.canonical.Unity8", true) != null) {
18+ if (sss != null && ((!) sss).lookup("com.canonical.Unity8", true) != null) {
19 unity8_settings = new Settings("com.canonical.Unity8");
20 ((!) unity8_settings).changed["osk-switch-visible"].connect((key) => {
21 get_desktop_menu().rebuild_osk_section(((!) unity8_settings).get_boolean(key));

Subscribers

People subscribed via source and target branches

to all changes: