Refactor PinyinProperties::propertyActivate method

2 files changed, 27 insertions, 17 deletions

diff --git a/src/PYPinyinProperties.cc b/src/PYPinyinProperties.cc
index 3f7f890..612db43 100644
--- a/src/PYPinyinProperties.cc
+++ b/src/PYPinyinProperties.cc
@@ -239,23 +239,7 @@ PinyinProperties::propertyActivate (const gchar *prop_name, guint prop_state) {
 #ifdef IBUS_BUILD_LUA_EXTENSION
     const int len = strlen("LuaConverter.");
     if (0 == strncmp (prop_name, "LuaConverter.", len)) {
-        if (prop_state == PROP_STATE_CHECKED) {
-            std::string name = prop_name + len;
-            if (name == "None")
-                m_config.luaConverter ("");
-            else
-                m_config.luaConverter (name);
-        }
-
-        for (auto iter = m_props_lua_converter_vec.begin ();
-             iter != m_props_lua_converter_vec.end (); ++iter) {
-            Property *prop = *iter;
-            if (0 == g_strcmp0 (prop->getKey (), prop_name)) {
-                prop->setState ((IBusPropState) prop_state);
-                updateProperty (*prop);
-            }
-        }
-
+        toggleLuaConverter (len, prop_name, prop_state);
         return TRUE;
     }
 #endif
@@ -270,6 +254,28 @@ PinyinProperties::setLuaPlugin (IBusEnginePlugin *plugin) {
     return TRUE;
 }
 
+void
+PinyinProperties::toggleLuaConverter (const int prefix_len,
+                                      const gchar *prop_name,
+                                      guint prop_state) {
+    if (prop_state == PROP_STATE_CHECKED) {
+        std::string name = prop_name + prefix_len;
+        if (name == "None")
+            m_config.luaConverter ("");
+        else
+            m_config.luaConverter (name);
+    }
+
+    for (auto iter = m_props_lua_converter_vec.begin ();
+         iter != m_props_lua_converter_vec.end (); ++iter) {
+        Property *prop = *iter;
+        if (0 == g_strcmp0 (prop->getKey (), prop_name)) {
+            prop->setState ((IBusPropState) prop_state);
+            updateProperty (*prop);
+        }
+    }
+}
+
 gboolean
 PinyinProperties::appendLuaConverter (void) {
     if (!m_lua_plugin)
diff --git a/src/PYPinyinProperties.h b/src/PYPinyinProperties.h
index 69632d1..6706032 100644
--- a/src/PYPinyinProperties.h
+++ b/src/PYPinyinProperties.h
@@ -92,6 +92,10 @@ private:
 public:
     gboolean setLuaPlugin (IBusEnginePlugin *plugin);
 
+    void toggleLuaConverter (const int prefix_len,
+                             const gchar *prop_name,
+                             guint prop_state);
+
     gboolean appendLuaConverter (void);
 #endif
 };