diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2008-07-28 14:29:05 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2008-07-28 14:29:05 +0800 |
| commit | e5e9f635f396f243d59afd153b131fbf6e7a69dc (patch) | |
| tree | 7a431af5a12a4ac2b84998c1c8e9168ec58602ec /panel | |
| parent | 7ee9eed921aed351408c480cab42aea50dee1aa2 (diff) | |
| download | ibus-e5e9f635f396f243d59afd153b131fbf6e7a69dc.tar.gz ibus-e5e9f635f396f243d59afd153b131fbf6e7a69dc.tar.xz ibus-e5e9f635f396f243d59afd153b131fbf6e7a69dc.zip | |
Use IBus replace Connection.
Diffstat (limited to 'panel')
| -rw-r--r-- | panel/main.py | 9 | ||||
| -rw-r--r-- | panel/panel.py | 20 |
2 files changed, 14 insertions, 15 deletions
diff --git a/panel/main.py b/panel/main.py index 29eb674..411cc36 100644 --- a/panel/main.py +++ b/panel/main.py @@ -30,13 +30,12 @@ PANEL_PATH = "/org/freedesktop/IBus/Panel" class PanelApplication: def __init__ (self): - self.__conn = ibus.Connection() - self.__conn.call_on_disconnection(self.__disconnected_cb) + self.__ibus = ibus.IBus() + self.__ibus.call_on_disconnection(self.__disconnected_cb) - self.__ibus = self.__conn.get_ibus() - self.__panel = panel.Panel(self.__conn, PANEL_PATH, self.__ibus) + self.__panel = panel.Panel(self.__ibus, PANEL_PATH) - self.__ibus.RegisterPanel(PANEL_PATH, True) + self.__ibus.register_panel(PANEL_PATH, True) def run(self): gtk.main() diff --git a/panel/panel.py b/panel/panel.py index b11312e..fab8eb6 100644 --- a/panel/panel.py +++ b/panel/panel.py @@ -31,9 +31,9 @@ from languagebar import LanguageBar from candidatepanel import CandidatePanel class Panel(ibus.PanelBase): - def __init__ (self, dbusconn, object_path, __ibus): - super(Panel, self).__init__(dbusconn, object_path) - self.__ibus = __ibus + def __init__ (self, _ibus, object_path): + super(Panel, self).__init__(_ibus, object_path) + self.__ibus = _ibus self.__focus_ic = None # add icon search path @@ -134,12 +134,12 @@ class Panel(ibus.PanelBase): self.reset() self.__focus_ic = ic - factory, enabled = self.__ibus.GetInputContextStates(ic) + factory, enabled = self.__ibus.get_input_context_states(ic) if factory == "" or not enabled: self.__set_im_icon("engine-default") else: - name, lang, icon, authors, credits = self.__ibus.GetFactoryInfo(factory) + name, lang, icon, authors, credits = self.__ibus.get_factory_info(factory) self.__set_im_icon(icon) self.__language_bar.focus_in() @@ -153,11 +153,11 @@ class Panel(ibus.PanelBase): def states_changed(self): if not self.__focus_ic: return - factory, enabled = self.__ibus.GetInputContextStates(self.__focus_ic) + factory, enabled = self.__ibus.get_input_context_states(self.__focus_ic) if enabled == False or not factory: self.__set_im_icon("engine-default") else: - name, lang, icon, authors, credits = self.__ibus.GetFactoryInfo(factory) + name, lang, icon, authors, credits = self.__ibus.get_factory_info(factory) self.__set_im_icon(icon) def reset(self): @@ -169,7 +169,7 @@ class Panel(ibus.PanelBase): def __create_im_menu(self): menu = gtk.Menu() - factories = self.__ibus.GetFactories() + factories = self.__ibus.get_factories() if not factories: item = gtk.MenuItem(label = "no engine") @@ -178,7 +178,7 @@ class Panel(ibus.PanelBase): else: tmp = {} for factory in factories: - name, lang, icon, authors, credits = self.__ibus.GetFactoryInfo(factory) + name, lang, icon, authors, credits = self.__ibus.get_factory_info(factory) lang = LANGUAGES.get(lang, "other") if not icon: icon = "engine-default" @@ -238,6 +238,6 @@ class Panel(ibus.PanelBase): self.__status_icon) def __menu_item_activate_cb(self, item, factory): - self.__ibus.SetFactory(factory) + self.__ibus.set_factory(factory) gobject.type_register(Panel, "IBusPanel") |