aboutsummaryrefslogtreecommitdiff
path: root/lib/indicator-menu.vala
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2014-06-13 14:13:25 -0400
committerWilliam Hua <william.hua@canonical.com>2014-06-13 14:13:25 -0400
commit8800a05d7dbdfb8ba5c6ce40fba69cad7a885920 (patch)
tree5f31b5e225adf152aac83e810aa170ab6f8b30e5 /lib/indicator-menu.vala
parente12eb4be6d83cff082bdfa5fb22bf689db79c5d3 (diff)
downloadayatana-indicator-keyboard-8800a05d7dbdfb8ba5c6ce40fba69cad7a885920.tar.gz
ayatana-indicator-keyboard-8800a05d7dbdfb8ba5c6ce40fba69cad7a885920.tar.bz2
ayatana-indicator-keyboard-8800a05d7dbdfb8ba5c6ce40fba69cad7a885920.zip
Pick IBus or Fcitx.
Diffstat (limited to 'lib/indicator-menu.vala')
-rw-r--r--lib/indicator-menu.vala7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/indicator-menu.vala b/lib/indicator-menu.vala
index 8e5661e2..115adc5f 100644
--- a/lib/indicator-menu.vala
+++ b/lib/indicator-menu.vala
@@ -22,7 +22,8 @@ public class Indicator.Keyboard.IndicatorMenu : MenuModel {
NONE = 0x0,
DCONF = 0x1,
IBUS = 0x2,
- SETTINGS = 0x4
+ FCITX = 0x4,
+ SETTINGS = 0x8
}
private Options options;
@@ -76,7 +77,9 @@ public class Indicator.Keyboard.IndicatorMenu : MenuModel {
sources_section.remove_all ();
for (var i = 0; i < sources.length; i++) {
- if (!sources[i].is_ibus || (options & Options.IBUS) != Options.NONE) {
+ if (sources[i].is_xkb ||
+ (sources[i].is_ibus && (options & Options.IBUS) != Options.NONE) ||
+ (sources[i].is_fcitx && (options & Options.FCITX) != Options.NONE)) {
string action;
if ((options & Options.DCONF) != Options.NONE) {