diff options
| author | William Hua <william.hua@canonical.com> | 2014-09-15 12:04:59 -0400 |
|---|---|---|
| committer | William Hua <william.hua@canonical.com> | 2014-09-15 12:04:59 -0400 |
| commit | cd8ecdbcb0d936b6e6ef2b9bdf4253162299cfd4 (patch) | |
| tree | 2ede12096751e018470ac2fe409d4134effb2e92 /lib/main.vala | |
| parent | 4d9387c577ae088321f8a4f6f1f4e14532502364 (diff) | |
| download | ayatana-indicator-keyboard-cd8ecdbcb0d936b6e6ef2b9bdf4253162299cfd4.tar.gz ayatana-indicator-keyboard-cd8ecdbcb0d936b6e6ef2b9bdf4253162299cfd4.tar.bz2 ayatana-indicator-keyboard-cd8ecdbcb0d936b6e6ef2b9bdf4253162299cfd4.zip | |
Hide indicator menu in desktop session when Fcitx is active.
Diffstat (limited to 'lib/main.vala')
| -rw-r--r-- | lib/main.vala | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/main.vala b/lib/main.vala index 748b2095..41ff5ff7 100644 --- a/lib/main.vala +++ b/lib/main.vala @@ -1004,15 +1004,14 @@ public class Indicator.Keyboard.Service : Object { [DBus (visible = false)] public IndicatorMenu get_desktop_menu () { if (desktop_menu == null) { - var options = IndicatorMenu.Options.DCONF - | IndicatorMenu.Options.SETTINGS; + var options = IndicatorMenu.Options.DCONF; - if (is_ibus_active ()) { - options |= IndicatorMenu.Options.IBUS; - } + if (!is_fcitx_active ()) { + options |= IndicatorMenu.Options.XKB | IndicatorMenu.Options.SETTINGS; - if (is_fcitx_active ()) { - options |= IndicatorMenu.Options.FCITX; + if (is_ibus_active ()) { + options |= IndicatorMenu.Options.IBUS; + } } desktop_menu = new IndicatorMenu (get_action_group (), options); @@ -1036,7 +1035,8 @@ public class Indicator.Keyboard.Service : Object { [DBus (visible = false)] public IndicatorMenu get_desktop_greeter_menu () { if (desktop_greeter_menu == null) { - var options = IndicatorMenu.Options.DCONF; + var options = IndicatorMenu.Options.DCONF | + IndicatorMenu.Options.XKB; desktop_greeter_menu = new IndicatorMenu (get_action_group (), options); ((!) desktop_greeter_menu).set_sources (get_sources ()); @@ -1048,7 +1048,7 @@ public class Indicator.Keyboard.Service : Object { [DBus (visible = false)] public IndicatorMenu get_desktop_lockscreen_menu () { if (desktop_lockscreen_menu == null) { - var options = IndicatorMenu.Options.NONE; + var options = IndicatorMenu.Options.XKB; desktop_lockscreen_menu = new IndicatorMenu (get_action_group (), options); ((!) desktop_lockscreen_menu).set_sources (get_sources ()); |