re-implement ibus in c language.

5 files changed, 166 insertions, 158 deletions

diff --git a/po/.gitignore b/po/.gitignore
index 3dc4511..76425a9 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -11,3 +11,8 @@ insert-header.sin
 quot.sed
 remove-potcdate.sed
 remove-potcdate.sin
+ja.gmo
+pa.gmo
+zh_CN.gmo
+ibus.pot
+stamp-po
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 775475e..444ed03 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,7 +19,7 @@
 ./ibus/lang.py
 ./ibus/lookuptable.py
 ./ibus/property.py
-./ibus/gtk.py
+./ibus/_gtk.py
 ./ibus/ascii.py
 ./ibus/factory.py
 ./ui/gtk/menu.py
@@ -31,20 +31,6 @@
 ./ui/gtk/panel.py
 ./ui/gtk/propitem.py
 ./ui/gtk/languagebar.py
-./gconf/main.py
-./gconf/config.py
 ./setup/main.py
 ./setup/keyboardshortcut.py
-./daemon/bus.py
-./daemon/register.py
-./daemon/contextmanager.py
-./daemon/ibusdaemon.py
-./daemon/factorymanager.py
-./daemon/engine.py
-./daemon/panel.py
-./daemon/config.py
-./daemon/inputcontext.py
-./daemon/lookuptable.py
-./daemon/enginefactory.py
-./daemon/connection.py
 ./setup/setup.glade
diff --git a/po/ja.po b/po/ja.po
index 9415eb2..abdbf0e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2008-10-19 09:45+0800\n"
+"POT-Creation-Date: 2009-02-05 10:29+0800\n"
 "PO-Revision-Date: 2008-08-28 17:31+0900\n"
 "Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -16,20 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ibus/lang.py:40 ui/gtk/panel.py:294 ui/gtk/panel.py:295 ui/gtk/panel.py:296
-#: ui/gtk/panel.py:297 setup/main.py:361 setup/main.py:362 setup/main.py:363
+#: ibus/lang.py:40 ui/gtk/panel.py:307 ui/gtk/panel.py:308 ui/gtk/panel.py:309
+#: ui/gtk/panel.py:310
 msgid "Other"
 msgstr ""
 
-#: ui/gtk/panel.py:94
+#: ui/gtk/panel.py:99
 msgid "iBus - Running"
 msgstr "iBus - 実行中"
 
-#: ui/gtk/panel.py:356
+#: ui/gtk/panel.py:370
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ui/gtk/panel.py:360
+#: ui/gtk/panel.py:374
 msgid "translator-credits"
 msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>"
 
@@ -37,23 +37,23 @@ msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>"
 msgid "Switch engine"
 msgstr ""
 
-#: setup/main.py:100
+#: setup/main.py:99
 msgid "trigger"
 msgstr "トリガー"
 
-#: setup/main.py:110
+#: setup/main.py:109
 msgid "next engine"
 msgstr "次のエンジン"
 
-#: setup/main.py:120
+#: setup/main.py:119
 msgid "prev engine"
 msgstr "前のエンジン"
 
-#: setup/main.py:165
+#: setup/main.py:197
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "IBus デーモンが動いていません。起動しますか？"
 
-#: setup/main.py:180
+#: setup/main.py:212
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -67,19 +67,7 @@ msgstr ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:202 setup/setup.glade:368
-msgid "Engine"
-msgstr "エンジン"
-
-#: setup/main.py:229
-msgid "Started"
-msgstr "開始"
-
-#: setup/main.py:239
-msgid "Preload"
-msgstr "プリロード"
-
-#: setup/main.py:249
+#: setup/main.py:227
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
@@ -108,25 +96,6 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "キーもしくはキーの組み合わせを入力してください"
 
-#: daemon/bus.py:221
-msgid "Cannot enable input engine"
-msgstr ""
-
-#: daemon/bus.py:222
-msgid ""
-"IBus can not enable input engine, because IBus does not load any input "
-"engines!\n"
-"Please use ibus-setup program to load some input engines."
-msgstr ""
-
-#: daemon/bus.py:224
-msgid "Setup"
-msgstr ""
-
-#: daemon/bus.py:224
-msgid "Don't show this again"
-msgstr ""
-
 #: setup/setup.glade:7
 msgid "IBus - Setup"
 msgstr "IBus - セットアップ"
@@ -183,7 +152,28 @@ msgstr ""
 msgid "General"
 msgstr "一般"
 
-#: setup/setup.glade:385
+#: setup/setup.glade:399
+msgid "gtk-add"
+msgstr ""
+
+#: setup/setup.glade:409
+#, fuzzy
+msgid "gtk-remove"
+msgstr "gtk-close"
+
+#: setup/setup.glade:422
+msgid "gtk-go-up"
+msgstr ""
+
+#: setup/setup.glade:435
+msgid "gtk-go-down"
+msgstr ""
+
+#: setup/setup.glade:460
+msgid "Engine"
+msgstr "エンジン"
+
+#: setup/setup.glade:477
 msgid ""
 "<big><b>iBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -193,10 +183,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: setup/setup.glade:410
+#: setup/setup.glade:502
 msgid "About"
 msgstr "About"
 
-#: setup/setup.glade:432
+#: setup/setup.glade:524
 msgid "gtk-close"
 msgstr "gtk-close"
+
+#~ msgid "Started"
+#~ msgstr "開始"
+
+#~ msgid "Preload"
+#~ msgstr "プリロード"
diff --git a/po/pa.po b/po/pa.po
index ddeb6af..483967b 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2008-10-19 09:45+0800\n"
+"POT-Creation-Date: 2009-02-05 10:29+0800\n"
 "PO-Revision-Date: 2008-10-17 14:15+0530\n"
 "Last-Translator: Amanpreet Singh <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-l10n@lists.sf.net>\n"
@@ -16,20 +16,20 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ibus/lang.py:40 ui/gtk/panel.py:294 ui/gtk/panel.py:295 ui/gtk/panel.py:296
-#: ui/gtk/panel.py:297 setup/main.py:361 setup/main.py:362 setup/main.py:363
+#: ibus/lang.py:40 ui/gtk/panel.py:307 ui/gtk/panel.py:308 ui/gtk/panel.py:309
+#: ui/gtk/panel.py:310
 msgid "Other"
 msgstr "ਹੋਰ"
 
-#: ui/gtk/panel.py:94
+#: ui/gtk/panel.py:99
 msgid "iBus - Running"
 msgstr "iBus -  ਚੱਲ ਰਿਹਾ ਹੈ"
 
-#: ui/gtk/panel.py:356
+#: ui/gtk/panel.py:370
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr "iBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।"
 
-#: ui/gtk/panel.py:360
+#: ui/gtk/panel.py:374
 msgid "translator-credits"
 msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
 
@@ -37,23 +37,23 @@ msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
 msgid "Switch engine"
 msgstr "ਇੰਜਣ ਬਦਲੋ"
 
-#: setup/main.py:100
+#: setup/main.py:99
 msgid "trigger"
 msgstr "ਟਰਿੱਗਰ"
 
-#: setup/main.py:110
+#: setup/main.py:109
 msgid "next engine"
 msgstr "ਅਗਲਾ ਇੰਜਣ"
 
-#: setup/main.py:120
+#: setup/main.py:119
 msgid "prev engine"
 msgstr "ਪਿਛਲਾ ਇੰਜਣ"
 
-#: setup/main.py:165
+#: setup/main.py:197
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "iBus ਡੈਮਨ ਚੱਲਦੀ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: setup/main.py:180
+#: setup/main.py:212
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -66,19 +66,7 @@ msgstr ""
 "
  export XMODIFIERS=@im=ibus\n"
 "
  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:202 setup/setup.glade:368
-msgid "Engine"
-msgstr "ਇੰਜਣ"
-
-#: setup/main.py:229
-msgid "Started"
-msgstr "ਚਾਲੂ ਹੈ"
-
-#: setup/main.py:239
-msgid "Preload"
-msgstr "ਪ੍ਰੀ-ਲੋਡ"
-
-#: setup/main.py:249
+#: setup/main.py:227
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
@@ -107,28 +95,6 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਸਵਿੱਚ ਜੋੜ)"
 
-#: daemon/bus.py:221
-msgid "Cannot enable input engine"
-msgstr "ਇੰਪੁੱਟ ਇੰਜਣ ਯੋਗ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
-
-#: daemon/bus.py:222
-msgid ""
-"IBus can not enable input engine, because IBus does not load any input "
-"engines!\n"
-"Please use ibus-setup program to load some input engines."
-msgstr ""
-"iBus ਕੋਈ ਇੰਪੁੱਟ ਇੰਜਣ ਯੋਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਹੈ, ਕਿਉਂਕਿ ਆਈ-ਬੱਸ ਕਿਸੇ ਇੰਪੁੱਟ ਇੰਜਣ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦੀ "
-"ਹੈ!\n"
-"
ਕੁਝ ਇੰਪੁੱਟ ਇੰਜਣ ਨੂੰ ਲੋਡ ਕਰਨ ਵਾਸਤੇ ibus-setup ਪਰੋਗਰਾਮ ਵਰਤੋਂ।"
-
-#: daemon/bus.py:224
-msgid "Setup"
-msgstr "ਸੈੱਟਅੱਪ"
-
-#: daemon/bus.py:224
-msgid "Don't show this again"
-msgstr "ਇਹ ਮੁੜ ਨਾ ਵੇਖਾਓ"
-
 #: setup/setup.glade:7
 msgid "IBus - Setup"
 msgstr "IBus - ਸੈੱਟਅੱਪ"
@@ -185,7 +151,28 @@ msgstr "<b>UI</b>"
 msgid "General"
 msgstr "ਆਮ"
 
-#: setup/setup.glade:385
+#: setup/setup.glade:399
+msgid "gtk-add"
+msgstr ""
+
+#: setup/setup.glade:409
+#, fuzzy
+msgid "gtk-remove"
+msgstr "gtk-close"
+
+#: setup/setup.glade:422
+msgid "gtk-go-up"
+msgstr ""
+
+#: setup/setup.glade:435
+msgid "gtk-go-down"
+msgstr ""
+
+#: setup/setup.glade:460
+msgid "Engine"
+msgstr "ਇੰਜਣ"
+
+#: setup/setup.glade:477
 msgid ""
 "<big><b>iBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -201,10 +188,34 @@ msgstr ""
 "
\n"
 "
\n"
 
-#: setup/setup.glade:410
+#: setup/setup.glade:502
 msgid "About"
 msgstr "ਇਸ ਬਾਰੇ"
 
-#: setup/setup.glade:432
+#: setup/setup.glade:524
 msgid "gtk-close"
 msgstr "gtk-close"
+
+#~ msgid "Started"
+#~ msgstr "ਚਾਲੂ ਹੈ"
+
+#~ msgid "Preload"
+#~ msgstr "ਪ੍ਰੀ-ਲੋਡ"
+
+#~ msgid "Cannot enable input engine"
+#~ msgstr "ਇੰਪੁੱਟ ਇੰਜਣ ਯੋਗ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
+
+#~ msgid ""
+#~ "IBus can not enable input engine, because IBus does not load any input "
+#~ "engines!\n"
+#~ "Please use ibus-setup program to load some input engines."
+#~ msgstr ""
+#~ "iBus ਕੋਈ ਇੰਪੁੱਟ ਇੰਜਣ ਯੋਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਹੈ, ਕਿਉਂਕਿ ਆਈ-ਬੱਸ ਕਿਸੇ ਇੰਪੁੱਟ ਇੰਜਣ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕਰ "
+#~ "ਸਕਦੀ ਹੈ!\n"
+#~ "
ਕੁਝ ਇੰਪੁੱਟ ਇੰਜਣ ਨੂੰ ਲੋਡ ਕਰਨ ਵਾਸਤੇ ibus-setup ਪਰੋਗਰਾਮ ਵਰਤੋਂ।"
+
+#~ msgid "Setup"
+#~ msgstr "ਸੈੱਟਅੱਪ"
+
+#~ msgid "Don't show this again"
+#~ msgstr "ਇਹ ਮੁੜ ਨਾ ਵੇਖਾਓ"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fdb59b7..7c5b745 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1.20080813\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2008-10-19 09:45+0800\n"
+"POT-Creation-Date: 2009-02-05 10:29+0800\n"
 "PO-Revision-Date: 2008-08-13 21:59+0800\n"
 "Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n"
 "Language-Team: Huang Peng <shawn.p.huang@gmail.com>\n"
@@ -16,20 +16,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ibus/lang.py:40 ui/gtk/panel.py:294 ui/gtk/panel.py:295 ui/gtk/panel.py:296
-#: ui/gtk/panel.py:297 setup/main.py:361 setup/main.py:362 setup/main.py:363
+#: ibus/lang.py:40 ui/gtk/panel.py:307 ui/gtk/panel.py:308 ui/gtk/panel.py:309
+#: ui/gtk/panel.py:310
 msgid "Other"
 msgstr "其他"
 
-#: ui/gtk/panel.py:94
+#: ui/gtk/panel.py:99
 msgid "iBus - Running"
 msgstr "iBus - 运行"
 
-#: ui/gtk/panel.py:356
+#: ui/gtk/panel.py:370
 msgid "IBus is an intelligent input bus for Linux/Unix."
 msgstr ""
 
-#: ui/gtk/panel.py:360
+#: ui/gtk/panel.py:374
 msgid "translator-credits"
 msgstr "Huang Peng <shawn.p.huang@gmail.com>"
 
@@ -37,23 +37,23 @@ msgstr "Huang Peng <shawn.p.huang@gmail.com>"
 msgid "Switch engine"
 msgstr "切换引擎"
 
-#: setup/main.py:100
+#: setup/main.py:99
 msgid "trigger"
 msgstr "开关"
 
-#: setup/main.py:110
+#: setup/main.py:109
 msgid "next engine"
 msgstr "下一个引擎"
 
-#: setup/main.py:120
+#: setup/main.py:119
 msgid "prev engine"
 msgstr "上一个引擎"
 
-#: setup/main.py:165
+#: setup/main.py:197
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "IBus守护进程没有启动，您是否想现在启动它？"
 
-#: setup/main.py:180
+#: setup/main.py:212
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -66,19 +66,7 @@ msgstr ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:202 setup/setup.glade:368
-msgid "Engine"
-msgstr "输入法引擎"
-
-#: setup/main.py:229
-msgid "Started"
-msgstr "启动"
-
-#: setup/main.py:239
-msgid "Preload"
-msgstr "预加载"
-
-#: setup/main.py:249
+#: setup/main.py:227
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择%s的快捷键"
@@ -107,27 +95,6 @@ msgstr ""
 msgid "Please press a key (or a key combination)"
 msgstr "请按一个键盘按键（或者一个组合按键）"
 
-#: daemon/bus.py:221
-msgid "Cannot enable input engine"
-msgstr "不能启动输入引擎"
-
-#: daemon/bus.py:222
-msgid ""
-"IBus can not enable input engine, because IBus does not load any input "
-"engines!\n"
-"Please use ibus-setup program to load some input engines."
-msgstr ""
-"IBus不能启动输入引擎，因为IBus没有加载任何输入引擎！\n"
-"请运行ibus-setup程序，启动需要的输入法引擎。"
-
-#: daemon/bus.py:224
-msgid "Setup"
-msgstr "设置"
-
-#: daemon/bus.py:224
-msgid "Don't show this again"
-msgstr "不再显示该信息"
-
 #: setup/setup.glade:7
 msgid "IBus - Setup"
 msgstr "IBus - 设置"
@@ -184,7 +151,27 @@ msgstr "<b>用户界面</b>"
 msgid "General"
 msgstr "通用"
 
-#: setup/setup.glade:385
+#: setup/setup.glade:399
+msgid "gtk-add"
+msgstr ""
+
+#: setup/setup.glade:409
+msgid "gtk-remove"
+msgstr ""
+
+#: setup/setup.glade:422
+msgid "gtk-go-up"
+msgstr ""
+
+#: setup/setup.glade:435
+msgid "gtk-go-down"
+msgstr ""
+
+#: setup/setup.glade:460
+msgid "Engine"
+msgstr "输入法引擎"
+
+#: setup/setup.glade:477
 msgid ""
 "<big><b>iBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -194,10 +181,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: setup/setup.glade:410
+#: setup/setup.glade:502
 msgid "About"
 msgstr "关于"
 
-#: setup/setup.glade:432
+#: setup/setup.glade:524
 msgid "gtk-close"
 msgstr ""
+
+#~ msgid "Started"
+#~ msgstr "启动"
+
+#~ msgid "Preload"
+#~ msgstr "预加载"
+
+#~ msgid "Cannot enable input engine"
+#~ msgstr "不能启动输入引擎"
+
+#~ msgid ""
+#~ "IBus can not enable input engine, because IBus does not load any input "
+#~ "engines!\n"
+#~ "Please use ibus-setup program to load some input engines."
+#~ msgstr ""
+#~ "IBus不能启动输入引擎，因为IBus没有加载任何输入引擎！\n"
+#~ "请运行ibus-setup程序，启动需要的输入法引擎。"
+
+#~ msgid "Setup"
+#~ msgstr "设置"
+
+#~ msgid "Don't show this again"
+#~ msgstr "不再显示该信息"