diff options
| author | Peng Wu <alexepico@gmail.com> | 2015-12-14 16:58:11 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2015-12-14 16:58:11 +0800 |
| commit | 0faf54eb96f18008cfb5d086da98f096c235408b (patch) | |
| tree | 1778f8bb4a80320cc53e5a6de47aff59c7d4aa18 /src/PYPConfig.cc | |
| parent | 9f197c3f4c675129e308de24e9be9e6f48756ba8 (diff) | |
| download | ibus-libpinyin-0faf54eb96f18008cfb5d086da98f096c235408b.tar.gz ibus-libpinyin-0faf54eb96f18008cfb5d086da98f096c235408b.tar.xz ibus-libpinyin-0faf54eb96f18008cfb5d086da98f096c235408b.zip | |
Revert "fixes m_bopomofo_keyboard_mapping option"
This reverts commit 9f197c3f4c675129e308de24e9be9e6f48756ba8.
Diffstat (limited to 'src/PYPConfig.cc')
| -rw-r--r-- | src/PYPConfig.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/PYPConfig.cc b/src/PYPConfig.cc index bbcee79..8ee11c6 100644 --- a/src/PYPConfig.cc +++ b/src/PYPConfig.cc @@ -109,8 +109,6 @@ LibPinyinConfig::initDefaultValues (void) m_init_simp_chinese = TRUE; m_special_phrases = TRUE; - m_bopomofo_keyboard_mapping = ZHUYIN_DEFAULT; - m_dictionaries = ""; m_main_switch = "<Shift>"; @@ -339,7 +337,7 @@ PinyinConfig::readDefaultValues (void) /* double pinyin */ m_double_pinyin = read (CONFIG_DOUBLE_PINYIN, false); - const gint map = read (CONFIG_DOUBLE_PINYIN_SCHEMA, DOUBLE_PINYIN_DEFAULT); + const gint map = read (CONFIG_DOUBLE_PINYIN_SCHEMA, 0); m_double_pinyin_schema = DOUBLE_PINYIN_DEFAULT; for (guint i = 0; i < G_N_ELEMENTS (double_pinyin_schemes); i++) { @@ -397,7 +395,7 @@ PinyinConfig::valueChanged (const std::string §ion, if (CONFIG_DOUBLE_PINYIN == name) m_double_pinyin = normalizeGVariant (value, false); else if (CONFIG_DOUBLE_PINYIN_SCHEMA == name) { - const gint map = normalizeGVariant (value, DOUBLE_PINYIN_DEFAULT); + const gint map = normalizeGVariant (value, 0); m_double_pinyin_schema = DOUBLE_PINYIN_DEFAULT; for (guint i = 0; i < G_N_ELEMENTS (double_pinyin_schemes); i++) { @@ -501,7 +499,7 @@ BopomofoConfig::readDefaultValues (void) m_special_phrases = read (CONFIG_SPECIAL_PHRASES, false); - const gint map = read (CONFIG_BOPOMOFO_KEYBOARD_MAPPING, ZHUYIN_DEFAULT); + const gint map = read (CONFIG_BOPOMOFO_KEYBOARD_MAPPING, 0); m_bopomofo_keyboard_mapping = ZHUYIN_DEFAULT; for (guint i = 0; i < G_N_ELEMENTS (chewing_schemes); i++) { @@ -543,7 +541,7 @@ BopomofoConfig::valueChanged (const std::string §ion, else if (CONFIG_SPECIAL_PHRASES == name) m_special_phrases = normalizeGVariant (value, false); else if (CONFIG_BOPOMOFO_KEYBOARD_MAPPING == name) { - const gint map = normalizeGVariant (value, ZHUYIN_DEFAULT); + const gint map = normalizeGVariant (value, 0); m_bopomofo_keyboard_mapping = ZHUYIN_DEFAULT; for (guint i = 0; i < G_N_ELEMENTS (chewing_schemes); i++) { |