1 files changed, 15 insertions, 66 deletions
diff --git a/ibus/interface/iibus.py b/ibus/interface/iibus.py
index cc5c351..848f798 100644
--- a/ibus/interface/iibus.py
+++ b/ibus/interface/iibus.py
@@ -23,100 +23,49 @@ __all__ = ("IIBus", )
 
 import dbus.service
 from ibus.common import \
-    IBUS_IFACE
+    IBUS_IFACE_IBUS
 
 class IIBus(dbus.service.Object):
     # define method decorator.
     method = lambda **args: \
-        dbus.service.method(dbus_interface=IBUS_IFACE, \
+        dbus.service.method(dbus_interface=IBUS_IFACE_IBUS, \
                             connection_keyword="dbusconn", \
                             **args)
 
     # define async method decorator.
     async_method = lambda **args: \
-        dbus.service.method(dbus_interface=IBUS_IFACE, \
+        dbus.service.method(dbus_interface=IBUS_IFACE_IBUS, \
                             connection_keyword="dbusconn", \
                             async_callbacks=("reply_cb", "error_cb"), \
                             **args)
 
     @method(out_signature="s")
-    def GetIBusAddress(self, dbusconn): pass
+    def GetAddress(self, dbusconn): pass
 
     # methods for ibus clients
-    @method(in_signature="s", out_signature="s")
+    @method(in_signature="s", out_signature="o")
     def CreateInputContext(self, client_name, dbusconn): pass
 
-    @method(in_signature="s")
-    def ReleaseInputContext(self, ic, dbusconn): pass
-
-    @async_method(in_signature="subu", out_signature="b")
-    def ProcessKeyEvent(self, ic, keyval, is_press, state, dbusconn, reply_cb, error_cb): pass
-
-    @method(in_signature="siiii")
-    def SetCursorLocation(self, ic, x, y, w, h, dbusconn): pass
-
-    @method(in_signature="s")
-    def FocusIn(self, ic, dbusconn): pass
-
-    @method(in_signature="s")
-    def FocusOut(self, ic, dbusconn): pass
-
-    @method(in_signature="s")
-    def Reset(self, ic, dbusconn): pass
-
-    @method(in_signature="s", out_signature="b")
-    def IsEnabled(self, ic, dbusconn): pass
-
-    @method(in_signature="si")
-    def SetCapabilities(self, ic, caps, dbusconn): pass
+    @method(in_signature="s", out_signature="sb")
+    def GetInputContextStates(self, ic, dbusconn): pass
 
     # methods for ibus engine provide
-    @method(in_signature="ao")
+    @method(in_signature="av")
     def RegisterFactories(self, object_paths, dbusconn): pass
 
-    @method(in_signature="ao")
+    @method(in_signature="av")
     def UnregisterFactories(self, object_paths, dbusconn): pass
 
     # general methods
-    @method(out_signature="av")
-    def GetFactories(self, dbusconn): pass
+    @method(in_signature="av")
+    def RegisterComponent(self, components, dbusconn): pass
 
-    @method(in_signature="o", out_signature="av")
-    def GetFactoryInfo(self, factory_path, dbusconn): pass
-
-    @method(in_signature="o")
-    def SetFactory(self, factory_path, dbusconn): pass
-
-    @method(in_signature="s", out_signature="sb")
-    def GetInputContextStates(self, ic, dbusconn): pass
-
-    @method(out_signature="a(sssssssb)")
-    def RegisterListEngines(self, dbusconn): pass
-
-    @method()
-    def RegisterReloadEngines(self, dbusconn): pass
-
-    @method(in_signature="ss")
-    def RegisterStartEngine(self, lang, name, dbusconn): pass
-
-    @method(in_signature="ss")
-    def RegisterRestartEngine(self, lang, name, dbusconn): pass
+    @method(out_signature="av")
+    def ListEngines(self, dbusconn): pass
 
-    @method(in_signature="ss")
-    def RegisterStopEngine(self, lang, name, dbusconn): pass
+    @method(out_signature="av")
+    def ListActiveEngines(self, dbusconn): pass
 
     @async_method()
     def Kill(self, dbusconn, reply_cb, error_cb): pass
 
-    #sigals
-    def CommitString(self, ic, text): pass
-
-    def UpdatePreedit(self, ic, text, attrs, cursor_pos, show): pass
-
-    def Enabled(self, ic): pass
-
-    def Disabled(self, ic): pass
-
-    def ConfigValueChanged(self, key, value): pass
-
-    def ConfigReload(self): pass