Merge lp:~attente/unity-settings-daemon/1494331 into lp:unity-settings-daemon

[William Hua]

Don't call fcitx_input_method_activate (). It breaks fcitx' "extra key for trigger input method" shortcut.

Don't call fcitx_input_method_activate (). It breaks fcitx' "extra key for trigger input method" shortcut.

[Sebastien Bacher (seb128)]

let's try it if that's what upstream fcitx recommends ;-)

review: Approve

=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c	2015-07-19 03:21:37 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c	2015-09-30 16:13:20 +0000
@@ -1330,7 +1330,6 @@
                 if (priv->is_fcitx_active && priv->fcitx) {
                         gchar *name = g_strdup_printf (FCITX_XKB_PREFIX "%s", id);
                         gchar *fcitx_name = get_fcitx_name (name);
-                        fcitx_input_method_activate (priv->fcitx);
                         fcitx_input_method_set_current_im (priv->fcitx, fcitx_name);
                         g_free (fcitx_name);
                         g_free (name);
@@ -1382,7 +1381,6 @@
                 if (priv->is_fcitx_active) {
                         if (priv->fcitx) {
                                 gchar *name = g_strdup (id);
-                                fcitx_input_method_activate (priv->fcitx);
                                 fcitx_input_method_set_current_im (priv->fcitx, name);
                                 g_free (name);
                         } else {