Merge xkb related changes.

setup/main.py

 # vim:set et sts=4 sw=4:
 #
 # ibus - The Input Bus
 #
 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
 # Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
@@ skipping 89 matching lines @@
                         ibus.CONFIG_GENERAL_SHORTCUT_TRIGGER_DEFAULT)
         button = self.__builder.get_object("button_trigger")
         entry = self.__builder.get_object("entry_trigger")
         entry.set_text("; ".join(shortcuts))
         entry.set_tooltip_text("\n".join(shortcuts))
         button.connect("clicked", self.__shortcut_button_clicked_cb,
                     N_("trigger"), "general/hotkey", "trigger", entry)
 
         # 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")
         self.__combobox_lookup_table_orientation.set_active(
             self.__config.get_value("panel", "lookup_table_orientation", 0))
         self.__combobox_lookup_table_orientation.connect("changed",
             self.__combobox_lookup_table_orientation_changed_cb)
 
         # auto hide
         self.__combobox_panel_show = self.__builder.get_object("combobox_panel_show")
@@ skipping 315 matching lines @@
         self.__window.present()
 
     def run(self):
         self.__window.show_all()
         signal.signal(signal.SIGUSR1, self.__sigusr1_cb)
         gtk.main()
 
 if __name__ == "__main__":
     setup = Setup()
     setup.run()