summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Peng <shawn.p.huang@gmail.com>2008-11-05 15:25:22 +0800
committerHuang Peng <shawn.p.huang@gmail.com>2008-11-05 15:25:22 +0800
commit1eb325a9c421bf4420004d6f0b8b5bce0fae5057 (patch)
treef1559e00cb01c7273cafa862a2211d9dd22349ac
parentd064312b82392763269cd9a0e05dd6e85ecbd175 (diff)
downloadibus-1eb325a9c421bf4420004d6f0b8b5bce0fae5057.tar.gz
ibus-1eb325a9c421bf4420004d6f0b8b5bce0fae5057.tar.xz
ibus-1eb325a9c421bf4420004d6f0b8b5bce0fae5057.zip
WIP.
-rw-r--r--bus/engineproxy.c4
-rw-r--r--bus/engineproxy.h2
-rw-r--r--bus/inputcontext.c5
3 files changed, 5 insertions, 6 deletions
diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index 64486a9..ed9cba5 100644
--- a/bus/engineproxy.c
+++ b/bus/engineproxy.c
@@ -585,8 +585,8 @@ bus_engine_proxy_set_cursor_location (BusEngineProxy *engine,
}
void
-bus_engine_proxy_set_capabilites (BusEngineProxy *engine,
- guint caps)
+bus_engine_proxy_set_capabilities (BusEngineProxy *engine,
+ guint caps)
{
g_assert (BUS_IS_ENGINE_PROXY (engine));
diff --git a/bus/engineproxy.h b/bus/engineproxy.h
index ff2d89a..7d444fc 100644
--- a/bus/engineproxy.h
+++ b/bus/engineproxy.h
@@ -72,7 +72,7 @@ void bus_engine_proxy_set_cursor_location
void bus_engine_proxy_focus_in (BusEngineProxy *engine);
void bus_engine_proxy_focus_out (BusEngineProxy *engine);
void bus_engine_proxy_reset (BusEngineProxy *engine);
-void bus_engine_proxy_set_capabilites (BusEngineProxy *engine,
+void bus_engine_proxy_set_capabilities (BusEngineProxy *engine,
guint caps);
void bus_engine_proxy_page_up (BusEngineProxy *engine);
void bus_engine_proxy_page_down (BusEngineProxy *engine);
diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index cf37e91..f06bc0a 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -493,11 +493,10 @@ _ic_set_capabilities (BusInputContext *context,
priv->capabilities = caps;
if (priv->engine) {
- bus_engine_proxy_set_capabilities (caps);
+ bus_engine_proxy_set_capabilities (priv->engine, caps);
}
}
- /* TODO */
reply = dbus_message_new_method_return (message);
return reply;
}
@@ -727,7 +726,7 @@ bus_input_context_enable_or_disabe_engine (BusInputContext *context)
if (priv->factory) {
g_signal_connect (priv->factory,
"destroy",
- _factory_destroy_cb,
+ G_CALLBACK (_factory_destroy_cb),
context);
g_object_ref (priv->factory);