Fix typos in ibus_bus_current_input_context().
authorJames Su <james.su@gmail.com>
Fri, 21 May 2010 21:44:41 +0000 (14:44 -0700)
committerJames Su <james.su@gmail.com>
Fri, 21 May 2010 21:44:41 +0000 (14:44 -0700)
src/ibusbus.c
src/test-bus.c

index 69ed8a1..211080e 100644 (file)
@@ -425,9 +425,9 @@ ibus_bus_current_input_context(IBusBus      *bus)
     gboolean result;
 
     result = ibus_bus_call (bus,
-                            DBUS_SERVICE_DBUS,
-                            DBUS_PATH_DBUS,
-                            DBUS_INTERFACE_DBUS,
+                            IBUS_SERVICE_IBUS,
+                            IBUS_PATH_IBUS,
+                            IBUS_INTERFACE_IBUS,
                             "CurrentInputContext",
                             G_TYPE_INVALID,
                             G_TYPE_STRING, &name,
index c01dad3..2721e5b 100644 (file)
@@ -53,17 +53,21 @@ int main()
        g_debug ("Test ibusbus.c: passed.");
 
        /* Test ibusinputcontext.c */
-#if 0
+#if 1
     {
            IBusInputContext *context;
            IBusEngineDesc *engine_desc;
+           const gchar *current_ic;
            context = ibus_bus_create_input_context (bus, "test");
-           ibus_input_context_set_capabilities (context, 0);
+           ibus_input_context_set_capabilities (context, IBUS_CAP_FOCUS);
            ibus_input_context_disable (context);
            g_assert (ibus_input_context_is_enabled (context) == FALSE);
            ibus_input_context_enable (context);
            g_assert (ibus_input_context_is_enabled (context) == TRUE);
+           ibus_input_context_focus_in (context);
            ibus_input_context_set_engine (context, active_engine_name);
+           current_ic = ibus_bus_current_input_context (bus);
+           g_assert (!strcmp (current_ic, ibus_proxy_get_path (IBUS_PROXY (context))));
            engine_desc = ibus_input_context_get_engine (context);
            g_assert (engine_desc);
            g_assert (!strcmp (active_engine_name, engine_desc->name));