diff options
author | Huang Peng <shawn.p.huang@gmail.com> | 2008-10-04 08:51:39 +0800 |
---|---|---|
committer | Huang Peng <shawn.p.huang@gmail.com> | 2008-10-04 08:51:39 +0800 |
commit | 397ff9ca92a2eaf8469b757243813849804f9290 (patch) | |
tree | b3fa22baa1a1a4ae1450d81120552b323d74ae1b /ibus | |
parent | d362fe98b9b428e21324a32e922529c8f9ac3837 (diff) | |
download | ibus-397ff9ca92a2eaf8469b757243813849804f9290.tar.gz ibus-397ff9ca92a2eaf8469b757243813849804f9290.tar.xz ibus-397ff9ca92a2eaf8469b757243813849804f9290.zip |
WIP.
Diffstat (limited to 'ibus')
-rw-r--r-- | ibus/bus.py | 11 | ||||
-rw-r--r-- | ibus/common.py | 8 | ||||
-rw-r--r-- | ibus/config.py | 2 |
3 files changed, 9 insertions, 12 deletions
diff --git a/ibus/bus.py b/ibus/bus.py index b189257..6bb21c8 100644 --- a/ibus/bus.py +++ b/ibus/bus.py @@ -108,7 +108,7 @@ class Bus(ibus.Object): "config-value-changed" : ( gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, - (gobject.TYPE_STRING, gobject.TYPE_PYOBJECT) + (gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT) ), "config-reloaded" : ( gobject.SIGNAL_RUN_FIRST, @@ -352,13 +352,10 @@ class Bus(ibus.Object): retval = dbus.lowlevel.HANDLER_RESULT_HANDLED # Config signals - elif message.is_signal(ibus.IBUS_IFACE, "ConfigValueChanged"): + elif message.is_signal(ibus.IBUS_CONFIG_IFACE, "ValueChanged"): args = message.get_args_list() - key, value = args[0:2] - self.emit("config-value-changed", key, value) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - elif message.is_signal(ibus.IBUS_IFACE, "ConfigReloaded"): - self.emit("config-reloaded") + section, name, value = args[0:3] + self.emit("config-value-changed", section, name, value) retval = dbus.lowlevel.HANDLER_RESULT_HANDLED # DBUS Disconnected signal diff --git a/ibus/common.py b/ibus/common.py index 7180acb..f410ac2 100644 --- a/ibus/common.py +++ b/ibus/common.py @@ -70,10 +70,10 @@ IBUS_IFACE = "org.freedesktop.IBus" IBUS_PATH = "/org/freedesktop/IBus" IBUS_NAME = "org.freedesktop.IBus" -IBUS_CONFIG_IFACE = "org.freedesktop.IBus.Config" -IBUS_ENGINE_FACTORY_IFACE = "org.freedesktop.IBus.EngineFactory" -IBUS_ENGINE_IFACE = "org.freedesktop.IBus.Engine" -IBUS_PANEL_IFACE = "org.freedesktop.IBus.Panel" +IBUS_CONFIG_IFACE = "org.freedesktop.ibus.Config" +IBUS_ENGINE_FACTORY_IFACE = "org.freedesktop.ibus.EngineFactory" +IBUS_ENGINE_IFACE = "org.freedesktop.ibus.Engine" +IBUS_PANEL_IFACE = "org.freedesktop.ibus.Panel" def default_reply_handler( *args): pass diff --git a/ibus/config.py b/ibus/config.py index 7001e52..24b4edc 100644 --- a/ibus/config.py +++ b/ibus/config.py @@ -56,7 +56,7 @@ class ConfigProxy(interface.IConfig): return self.__config.get_value(section, name) def SetValue(self, section, name, value): - return self.__config.set_value(section, name, name) + return self.__config.set_value(section, name, value) def Destroy(self): self.__config.destroy() |