summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2016-11-14 14:11:24 +0800
committerPeng Wu <alexepico@gmail.com>2016-11-14 14:11:24 +0800
commit0303fd3ab567c08b2e98886e11fda5387b5ba1e3 (patch)
tree84f12f8413da55eb580f252a1e2e90fb680be829
parent77c560f2a8b8889c01e1f1627b2262c1e7d91912 (diff)
downloadibus-libpinyin-0303fd3ab567c08b2e98886e11fda5387b5ba1e3.tar.gz
ibus-libpinyin-0303fd3ab567c08b2e98886e11fda5387b5ba1e3.tar.xz
ibus-libpinyin-0303fd3ab567c08b2e98886e11fda5387b5ba1e3.zip
use libpinyin config namespace
-rw-r--r--setup/main2.py14
-rw-r--r--src/PYPConfig.cc4
2 files changed, 9 insertions, 9 deletions
diff --git a/setup/main2.py b/setup/main2.py
index 3610d9d..167e030 100644
--- a/setup/main2.py
+++ b/setup/main2.py
@@ -62,8 +62,8 @@ class PreferencesDialog:
self.__dialog = self.__builder.get_object("dialog")
self.__init_pages()
- if engine == "pinyin":
- self.__config_namespace = "engine/Pinyin"
+ if engine == "libpinyin":
+ self.__config_namespace = "engine/libpinyin"
self.__values = dict(self.__config.get_values(self.__config_namespace))
self.__init_general()
self.__init_pinyin()
@@ -72,8 +72,8 @@ class PreferencesDialog:
self.__init_user_data()
self.__init_shortcut()
self.__init_about()
- elif engine == "bopomofo":
- self.__config_namespace = "engine/Bopomofo"
+ elif engine == "libbopomofo":
+ self.__config_namespace = "engine/libbopomofo"
self.__values = dict(self.__config.get_values(self.__config_namespace))
self.__init_general()
self.__init_bopomofo()
@@ -496,11 +496,11 @@ class PreferencesDialog:
return self.__dialog.run()
def main():
- name = "pinyin"
+ name = "libpinyin"
if len(sys.argv) == 2:
name = sys.argv[1]
- if name not in ("pinyin", "bopomofo"):
- name = "pinyin"
+ if name not in ("libpinyin", "libbopomofo"):
+ name = "libpinyin"
PreferencesDialog(name).run()
diff --git a/src/PYPConfig.cc b/src/PYPConfig.cc
index 1b24666..7d8139f 100644
--- a/src/PYPConfig.cc
+++ b/src/PYPConfig.cc
@@ -318,7 +318,7 @@ static const struct{
};
PinyinConfig::PinyinConfig (Bus & bus)
- : LibPinyinConfig (bus, "pinyin")
+ : LibPinyinConfig (bus, "libpinyin")
{
}
@@ -475,7 +475,7 @@ static const struct {
};
BopomofoConfig::BopomofoConfig (Bus & bus)
- : LibPinyinConfig (bus, "bopomofo")
+ : LibPinyinConfig (bus, "libbopomofo")
{
}