remove the ctrl switch option

3 files changed, 1 insertions, 8 deletions

diff --git a/src/PYConfig.cc b/src/PYConfig.cc
index 35e74e2..b456b16 100644
--- a/src/PYConfig.cc
+++ b/src/PYConfig.cc
@@ -46,7 +46,6 @@ Config::initDefaultValues (void)
 {
     m_orientation = IBUS_ORIENTATION_HORIZONTAL;
     m_page_size = 5;
-    m_ctrl_switch = FALSE;
     m_shift_select_candidate = FALSE;
     m_minus_equal_page = TRUE;
     m_comma_period_page = TRUE;
diff --git a/src/PYConfig.h b/src/PYConfig.h
index 9eec5a6..5083da9 100644
--- a/src/PYConfig.h
+++ b/src/PYConfig.h
@@ -45,7 +45,6 @@ public:
     pinyin_option_t option (void) const         { return m_option & m_option_mask; }
     guint orientation (void) const              { return m_orientation; }
     guint pageSize (void) const                 { return m_page_size; }
-    G_DEPRECATED gboolean ctrlSwitch (void) const{ return m_ctrl_switch; }
     std::string mainSwitch (void) const         { return m_main_switch; }
     std::string letterSwitch (void) const       { return m_letter_switch; }
     std::string punctSwitch (void) const        { return m_punct_switch; }
@@ -94,7 +93,6 @@ protected:
 
     gint m_orientation;
     guint m_page_size;
-    gboolean m_ctrl_switch;
     std::string m_main_switch;
     std::string m_letter_switch;
     std::string m_punct_switch;
diff --git a/src/PYPConfig.cc b/src/PYPConfig.cc
index 6aaa116..0129b03 100644
--- a/src/PYPConfig.cc
+++ b/src/PYPConfig.cc
@@ -32,7 +32,7 @@ const gchar * const CONFIG_CORRECT_PINYIN            = "CorrectPinyin";
 const gchar * const CONFIG_FUZZY_PINYIN              = "FuzzyPinyin";
 const gchar * const CONFIG_ORIENTATION               = "LookupTableOrientation";
 const gchar * const CONFIG_PAGE_SIZE                 = "LookupTablePageSize";
-const gchar * const CONFIG_CTRL_SWITCH               = "CtrlSwitch";
+/* const gchar * const CONFIG_CTRL_SWITCH               = "CtrlSwitch"; */
 const gchar * const CONFIG_MAIN_SWITCH               = "MainSwitch";
 const gchar * const CONFIG_LETTER_SWITCH             = "LetterSwitch";
 const gchar * const CONFIG_PUNCT_SWITCH              = "PunctSwitch";
@@ -90,7 +90,6 @@ LibPinyinConfig::initDefaultValues (void)
 
     m_orientation = IBUS_ORIENTATION_HORIZONTAL;
     m_page_size = 5;
-    m_ctrl_switch = FALSE;
     m_shift_select_candidate = FALSE;
     m_minus_equal_page = TRUE;
     m_comma_period_page = TRUE;
@@ -169,7 +168,6 @@ LibPinyinConfig::readDefaultValues (void)
         m_page_size = 5;
         g_warn_if_reached ();
     }
-    m_ctrl_switch = read(CONFIG_CTRL_SWITCH, false);
     m_main_switch = read(CONFIG_MAIN_SWITCH, std::string ("<Shift>"));
     m_letter_switch = read(CONFIG_LETTER_SWITCH, std::string (""));
     m_punct_switch = read(CONFIG_PUNCT_SWITCH, std::string ("<Control>period"));
@@ -218,8 +216,6 @@ LibPinyinConfig::valueChanged (const std::string &section,
             m_page_size = 5;
             g_warn_if_reached ();
         }
-    } else if (CONFIG_CTRL_SWITCH == name) {
-        m_ctrl_switch = normalizeGVariant (value, false);
     } else if (CONFIG_MAIN_SWITCH == name) {
         m_main_switch = normalizeGVariant (value, std::string ("<Shift>"));
     } else if (CONFIG_LETTER_SWITCH == name) {