diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2008-07-31 20:01:07 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2008-07-31 20:01:07 +0800 |
| commit | dda9227c7c81260395a8eeecce054bd211da2118 (patch) | |
| tree | a265ead5ebeaf51f303fe174089b71b963902b79 | |
| parent | 74b3f65af54cd383f3d7a64afedb99ccf6a1453f (diff) | |
| download | ibus-dda9227c7c81260395a8eeecce054bd211da2118.tar.gz ibus-dda9227c7c81260395a8eeecce054bd211da2118.tar.xz ibus-dda9227c7c81260395a8eeecce054bd211da2118.zip | |
Rename get_conn to get_dbusconn.
| -rw-r--r-- | ibus/bus.py | 10 | ||||
| -rw-r--r-- | ibus/engine.py | 2 | ||||
| -rw-r--r-- | ibus/factory.py | 2 | ||||
| -rw-r--r-- | ibus/panel.py | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ibus/bus.py b/ibus/bus.py index edacdb8..01992fd 100644 --- a/ibus/bus.py +++ b/ibus/bus.py @@ -47,9 +47,9 @@ class Bus(ibus.Object): def __init__(self): super(Bus, self).__init__() - self.__conn = dbus.connection.Connection(ibus.IBUS_ADDR) - self.__bus = self.__conn.get_object(ibus.IBUS_NAME, ibus.IBUS_PATH) - self.__conn.add_message_filter(self.__dbus_message_cb) + self.__dbusconn = dbus.connection.Connection(ibus.IBUS_ADDR) + self.__bus = self.__dbusconn.get_object(ibus.IBUS_NAME, ibus.IBUS_PATH) + self.__dbusconn.add_message_filter(self.__dbus_message_cb) def __dbus_message_cb(self, conn, message): if message.is_signal(ibus.IBUS_IFACE, "ConfigValueChanged"): @@ -68,8 +68,8 @@ class Bus(ibus.Object): return retval - def get_conn(self): - return self.__conn + def get_dbusconn(self): + return self.__dbusconn def get_address(self): return ibus.IBUS_ADDR diff --git a/ibus/engine.py b/ibus/engine.py index c7c5080..46423c0 100644 --- a/ibus/engine.py +++ b/ibus/engine.py @@ -29,7 +29,7 @@ from ibus import interface class EngineBase(ibus.Object): def __init__(self, bus, object_path): super(EngineBase, self).__init__() - self.__proxy = EngineProxy (self, bus.get_conn(), object_path) + self.__proxy = EngineProxy (self, bus.get_dbusconn(), object_path) def process_key_event(self, keyval, is_press, state): return False diff --git a/ibus/factory.py b/ibus/factory.py index 018e0c3..1f8cef3 100644 --- a/ibus/factory.py +++ b/ibus/factory.py @@ -29,7 +29,7 @@ from ibus import interface class EngineFactoryBase(ibus.Object): def __init__(self, info, engine_class, engine_path, bus, object_path): super(EngineFactoryBase, self).__init__() - self.__proxy = EngineFactoryProxy (self, bus.get_conn(), object_path) + self.__proxy = EngineFactoryProxy (self, bus.get_dbusconn(), object_path) self.__info = info self.__bus = bus self.__engine_class = engine_class diff --git a/ibus/panel.py b/ibus/panel.py index a26487f..de8e3e8 100644 --- a/ibus/panel.py +++ b/ibus/panel.py @@ -45,7 +45,7 @@ class PanelMenu(PanelItem): class PanelBase(ibus.Object): def __init__(self, bus, object_path): super(PanelBase, self).__init__() - self.__proxy = PanelProxy(self, bus.get_conn(), object_path) + self.__proxy = PanelProxy(self, bus.get_dbusconn(), object_path) def set_cursor_location(self, x, y, w, h): pass |