commit 817399605bdeeb83fa4729018b2b17ad7870576d
Author: Peng Huang <shawn.p.huang@gmail.com>
Date:   Thu Jun 24 11:11:51 2010 +0800

    Fix next_engine & prev_engine settings problems.

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index ccb0cf0..c14831c 100644
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -395,11 +395,15 @@ bus_ibus_impl_reload_config (BusIBusImpl *ibus)
         void ( *func) (BusIBusImpl *, GValue *);
     } entries [] = {
         { "general/hotkey", "trigger", bus_ibus_impl_set_trigger },
+        #if 0
         /* Only for backward compatibility, shall be removed later. */
         { "general/hotkey", "next_engine", bus_ibus_impl_set_next_engine_in_menu },
+        #endif
         { "general/hotkey", "next_engine_in_menu", bus_ibus_impl_set_next_engine_in_menu },
+        #if 0
         /* Only for backward compatibility, shall be removed later. */
         { "general/hotkey", "prev_engine", bus_ibus_impl_set_previous_engine },
+        #endif
         { "general/hotkey", "previous_engine", bus_ibus_impl_set_previous_engine },
         { "general", "preload_engines", bus_ibus_impl_set_preload_engines },
         { "general", "use_system_keyboard_layout", bus_ibus_impl_set_use_sys_layout },
@@ -444,11 +448,15 @@ _config_value_changed_cb (IBusConfig  *config,
         void ( *func) (BusIBusImpl *, GValue *);
     } entries [] = {
         { "general/hotkey", "trigger", bus_ibus_impl_set_trigger },
+        #if 0
         /* Only for backward compatibility, shall be removed later. */
         { "general/hotkey", "next_engine", bus_ibus_impl_set_next_engine_in_menu },
+        #endif
         { "general/hotkey", "next_engine_in_menu", bus_ibus_impl_set_next_engine_in_menu },
+        #if 0
         /* Only for backward compatibility, shall be removed later. */
         { "general/hotkey", "prev_engine", bus_ibus_impl_set_previous_engine },
+        #endif
         { "general/hotkey", "previous_engine", bus_ibus_impl_set_previous_engine },
         { "general", "preload_engines",    bus_ibus_impl_set_preload_engines },
         { "general", "use_system_keyboard_layout", bus_ibus_impl_set_use_sys_layout },
diff --git a/setup/main.py b/setup/main.py
index 4d8a328..d778ac3 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -107,25 +107,25 @@ class Setup(object):
 
         # next engine
         shortcuts = self.__config.get_value(
-                        "general/hotkey", "next_engine",
+                        "general/hotkey", "next_engine_in_menu",
                         ibus.CONFIG_GENERAL_SHORTCUT_NEXT_ENGINE_DEFAULT)
         button = self.__builder.get_object("button_next_engine")
         entry = self.__builder.get_object("entry_next_engine")
         entry.set_text("; ".join(shortcuts))
         entry.set_tooltip_text("\n".join(shortcuts))
         button.connect("clicked", self.__shortcut_button_clicked_cb,
-                    N_("next input method"), "general/hotkey", "next_engine", entry)
+                    N_("next input method"), "general/hotkey", "next_engine_in_menu", entry)
 
         # prev engine
         shortcuts = self.__config.get_value(
-                        "general/hotkey", "prev_engine",
+                        "general/hotkey", "previous_engine",
                         ibus.CONFIG_GENERAL_SHORTCUT_PREV_ENGINE_DEFAULT)
         button = self.__builder.get_object("button_prev_engine")
         entry = self.__builder.get_object("entry_prev_engine")
         entry.set_text("; ".join(shortcuts))
         entry.set_tooltip_text("\n".join(shortcuts))
         button.connect("clicked", self.__shortcut_button_clicked_cb,
-                    N_("previous input method"), "general/hotkey", "prev_engine", entry)
+                    N_("previous input method"), "general/hotkey", "previous_engine", entry)
 
         # lookup table orientation
         self.__combobox_lookup_table_orientation = self.__builder.get_object("combobox_lookup_table_orientation")