summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorHuang Peng <shawn.p.huang@gmail.com>2009-03-20 14:07:30 +0800
committerHuang Peng <shawn.p.huang@gmail.com>2009-03-20 14:07:30 +0800
commit0aa48a09c1ccca63e6909204e1ec673dff2341c2 (patch)
treef4e85128f8178761e28ce65f655e9ab477c153ac /client
parent1a76fee5d5c7926e0d4f54a5dbd34bff8007d062 (diff)
parentab417dd043ee6ba338518758c1c833f6ccbb7bdf (diff)
downloadibus-definite.tar.gz
ibus-definite.tar.xz
ibus-definite.zip
Merge commit 'origin/master' into definitedefinite
Conflicts: po/fr.po
Diffstat (limited to 'client')
-rw-r--r--client/gtk2/ibusimcontext.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 29e7753..4483696 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -569,7 +569,6 @@ _ibus_context_commit_text_cb (IBusInputContext *ibus_context,
static void
_ibus_context_forward_key_event_cb (IBusInputContext *ibus_context,
guint keyval,
- gboolean is_press,
guint state,
IBusIMContext *context)
{
@@ -579,7 +578,7 @@ _ibus_context_forward_key_event_cb (IBusInputContext *ibus_context,
IBusIMContextPrivate *priv;
priv = context->priv;
- event = (GdkEventKey *)gdk_event_new (is_press ? GDK_KEY_PRESS : GDK_KEY_RELEASE);
+ event = (GdkEventKey *)gdk_event_new (state & IBUS_RELEASE_MASK ? GDK_KEY_RELEASE : GDK_KEY_PRESS);
event->time = GDK_CURRENT_TIME;
event->window = g_object_ref (priv->client_window);