Fix focus issue when reconnect to ibus-daemon

BUG=none
TEST=Linux desktop

Review URL: http://codereview.appspot.com/4365049

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index fa14fe3..73ded00 100644 (file)
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -2488,3 +2488,11 @@ bus_input_context_set_capabilities (BusInputContext    *context,
 
     context->capabilities = capabilities;
 }
+
+
+const gchar *
+bus_input_context_get_client (BusInputContext *context)
+{
+    g_assert (BUS_IS_INPUT_CONTEXT (context));
+    return context->client;
+}

diff --git a/bus/inputcontext.h b/bus/inputcontext.h
index b2e6323..bc4e096 100644 (file)
--- a/bus/inputcontext.h
+++ b/bus/inputcontext.h
@@ -207,5 +207,11 @@ guint                bus_input_context_get_capabilities (BusInputContext    *con
 void                 bus_input_context_set_capabilities (BusInputContext    *context,
                                                          guint               capabilities);
 
+/**
+ * bus_input_context_get_client:
+ * @returns: context->client.
+ */
+const gchar         *bus_input_context_get_client       (BusInputContext    *context);
+
 G_END_DECLS
 #endif

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index dcd356f..dc3640e 100644 (file)
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -1426,7 +1426,7 @@ _create_input_context_done (IBusBus       *bus,
         ibus_input_context_set_capabilities (ibusimcontext->ibuscontext, ibusimcontext->caps);
 
         if (ibusimcontext->has_focus) {
-            gtk_im_context_focus_in (GTK_IM_CONTEXT (ibusimcontext));
+            ibus_input_context_focus_in (ibusimcontext->ibuscontext);
         }
     }