Unity Settings Daemon

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

  1. 1494331
  2. Merge into trunk
Proposed by William Hua
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 4096
Merged at revision: 4099
Proposed branch: lp:~attente/unity-settings-daemon/1494331
Merge into: lp:unity-settings-daemon
Diff against target: 19 lines (+0/-2)
1 file modified
plugins/keyboard/gsd-keyboard-manager.c (+0/-2)
To merge this branch: bzr merge lp:~attente/unity-settings-daemon/1494331
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+272944@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
2--- plugins/keyboard/gsd-keyboard-manager.c 2015-07-19 03:21:37 +0000
3+++ plugins/keyboard/gsd-keyboard-manager.c 2015-09-30 16:13:20 +0000
4@@ -1330,7 +1330,6 @@
5 if (priv->is_fcitx_active && priv->fcitx) {
6 gchar *name = g_strdup_printf (FCITX_XKB_PREFIX "%s", id);
7 gchar *fcitx_name = get_fcitx_name (name);
8- fcitx_input_method_activate (priv->fcitx);
9 fcitx_input_method_set_current_im (priv->fcitx, fcitx_name);
10 g_free (fcitx_name);
11 g_free (name);
12@@ -1382,7 +1381,6 @@
13 if (priv->is_fcitx_active) {
14 if (priv->fcitx) {
15 gchar *name = g_strdup (id);
16- fcitx_input_method_activate (priv->fcitx);
17 fcitx_input_method_set_current_im (priv->fcitx, name);
18 g_free (name);
19 } else {

Subscribers

People subscribed via source and target branches