diff options
author | William Hua <william.hua@canonical.com> | 2014-04-09 07:40:17 +1200 |
---|---|---|
committer | William Hua <william.hua@canonical.com> | 2014-04-09 07:40:17 +1200 |
commit | 0e4cbba14d910e40cafb37199730f3387c9ce279 (patch) | |
tree | f7dd1872184e01aed644b4afebe367f31c98615e /lib | |
parent | 26afec3a316a0f7c2e62ae8d574a5d354ebcdde4 (diff) | |
parent | e8c1f8e82148dd928b37d9e5a0750b356fb0e156 (diff) | |
download | ayatana-indicator-keyboard-0e4cbba14d910e40cafb37199730f3387c9ce279.tar.gz ayatana-indicator-keyboard-0e4cbba14d910e40cafb37199730f3387c9ce279.tar.bz2 ayatana-indicator-keyboard-0e4cbba14d910e40cafb37199730f3387c9ce279.zip |
Merge trunk fixing conflicts.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/main.vala | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/main.vala b/lib/main.vala index 8d8c213f..8543dd3e 100644 --- a/lib/main.vala +++ b/lib/main.vala @@ -130,6 +130,19 @@ public class Indicator.Keyboard.Service : Object { if (ibus == null) { IBus.init (); ibus = new IBus.Bus (); + ((!) ibus).connected.connect (() => { + if (desktop_menu != null) { + get_desktop_menu ().set_sources (get_sources ()); + } + + if (desktop_greeter_menu != null) { + get_desktop_greeter_menu ().set_sources (get_sources ()); + } + + if (indicator_action != null) { + update_indicator_action (); + } + }); } return (!) ibus; |