Fixed Bug 854161 - not able to add keymap with ibus-setup

- Updated ibus-530711-preload-sys.patch
- Updated ibus-541492-xkb.patch
- Updated ibus-xx-no-use.diff

ibus-530711-preload-sys.patch

@@ -1,6 +1,6 @@
-From e035e26100e9495ab83a6c3739448c3b5349321c Mon Sep 17 00:00:00 2001
+From 87a84380b6e8da9f61671d96eca20bc700579ca6 Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 15 Aug 2012 18:24:59 +0900
+Date: Thu, 6 Sep 2012 12:48:44 +0900
 Subject: [PATCH] Reload preload engines until users customize the list.
 
 The idea is, if users don't customize the preload_engines with ibus-setup,
@@ -60,7 +60,7 @@ index 07169ae..4086f67 100644
        <applyto>/desktop/ibus/general/preload_engines</applyto>
        <owner>ibus</owner>
 diff --git a/setup/main.py b/setup/main.py
-index f3fe1c5..b7833e3 100644
+index 9bc16f0..d62bdf2 100644
 --- a/setup/main.py
 +++ b/setup/main.py
 @@ -181,6 +181,20 @@ class Setup(object):
@@ -148,7 +148,7 @@ index f3fe1c5..b7833e3 100644
 +        if section == 'general' and name == 'preload_engines':
 +            value = []
 +            if variant != None:
-+                value = variant.dup_strv()[0]
++                value = variant.dup_strv()
 +            engines = self.__get_engine_descs_from_names(value)
 +            current_engines = self.__treeview.get_engines()
 +            engines_csv = str.join(',', map(lambda e: e.get_name(), engines))
@@ -228,10 +228,10 @@ index 737b3e2..8ce5a16 100644
   * @x: x coordinate.
   * @y: y coordinate.
 diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
-index 06d1e44..3464ba8 100644
+index 8cb5e8c..d7b925b 100644
 --- a/ui/gtk3/panel.vala
 +++ b/ui/gtk3/panel.vala
-@@ -298,6 +298,8 @@ class Panel : IBus.PanelService {
+@@ -299,6 +299,8 @@ class Panel : IBus.PanelService {
          if (m_config != null) {
              m_config.value_changed.connect(config_value_changed_cb);
              m_config.watch("general", "preload_engines");
@@ -240,7 +240,7 @@ index 06d1e44..3464ba8 100644
              m_config.watch("general", "engines_order");
              m_config.watch("general/hotkey", "trigger_accel");
              m_config.watch("general/hotkey", "trigger_accel_backward");
-@@ -359,7 +361,136 @@ class Panel : IBus.PanelService {
+@@ -360,7 +362,136 @@ class Panel : IBus.PanelService {
              init_gkbd();
          }
  
@@ -377,7 +377,7 @@ index 06d1e44..3464ba8 100644
      }
  
      private void update_xkb_engines() {
-@@ -520,6 +651,11 @@ class Panel : IBus.PanelService {
+@@ -521,6 +652,11 @@ class Panel : IBus.PanelService {
                                           string section,
                                           string name,
                                           Variant variant) {

ibus-541492-xkb.patch

@@ -1,6 +1,6 @@
-From 2e159c7634a02c38729992f5016660585bec4d89 Mon Sep 17 00:00:00 2001
+From 127b639fe84cafcb65247654757fd6fde10c8e44 Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 22 Aug 2012 19:50:06 +0900
+Date: Thu, 6 Sep 2012 12:47:09 +0900
 Subject: [PATCH] Add ibus-xkb and libgnomekbd.
 
 ---
@@ -1544,7 +1544,7 @@ index 58cac38..4b6f869 100644
  
  # make -C po update-gmo
 diff --git a/setup/main.py b/setup/main.py
-index 300f11b..f3fe1c5 100644
+index 300f11b..9bc16f0 100644
 --- a/setup/main.py
 +++ b/setup/main.py
 @@ -183,14 +183,22 @@ class Setup(object):
@@ -1554,7 +1554,7 @@ index 300f11b..f3fe1c5 100644
 +        value = self.__config.get_value("general", "load_xkb_layouts")
 +        load_layouts = []
 +        if value != None:
-+            load_layouts = value.dup_strv()[0]
++            load_layouts = value.dup_strv()
 +        engines = []
 +        for engine in self.__engines:
 +            if not engine.get_name().startswith('xkb:'):

ibus-xx-no-use.diff

@@ -1,6 +1,6 @@
-From 22c52cc54228a64c7e26cc33de9a47d8b1e98add Mon Sep 17 00:00:00 2001
+From 7ba6b518fe414e2dc988acd9f7688ceca56d69f8 Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 15 Aug 2012 18:36:29 +0900
+Date: Thu, 6 Sep 2012 13:05:56 +0900
 Subject: [PATCH] Disabled to show non-used GUI.
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH] Disabled to show non-used GUI.
  2 files changed, 77 insertions(+), 24 deletions(-)
 
 diff --git a/setup/main.py b/setup/main.py
-index 0e4c83d..0e33d7b 100644
+index cf63643..d14796c 100644
 --- a/setup/main.py
 +++ b/setup/main.py
 @@ -77,22 +77,31 @@ class Setup(object):
@@ -66,7 +66,7 @@ index 0e4c83d..0e33d7b 100644
 +            orig_list =['<Control><Shift>space']
 +        variant = self.__config.get_value(section, name)
 +        if variant != None:
-+            orig_list = variant.dup_strv()[0]
++            orig_list = variant.dup_strv()
 +        orig_text = ';'.join(orig_list)
 +        if text == orig_text:
 +            return

ibus-xx-setup-frequent-lang.patch

@@ -1,6 +1,6 @@
-From 7a37c380e3aa0dc0111b0a238b0d38b3521acc00 Mon Sep 17 00:00:00 2001
+From 75fccb88c64fd28f20901608810da16cc57b4fc7 Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 15 Aug 2012 18:25:08 +0900
+Date: Thu, 6 Sep 2012 12:50:14 +0900
 Subject: [PATCH] Enable ibus-setup to show the frequently used languages
  only in IME list.
 
@@ -411,7 +411,7 @@ index f80b164..578098c 100644
          return self.get_property("active-engine")
  
 diff --git a/setup/main.py b/setup/main.py
-index b7833e3..408e655 100644
+index d62bdf2..a69617d 100644
 --- a/setup/main.py
 +++ b/setup/main.py
 @@ -209,6 +209,7 @@ class Setup(object):

ibus.spec

@@ -30,7 +30,7 @@
 
 Name:       ibus
 Version:    1.4.99.20120822
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -473,6 +473,12 @@ dconf update
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Sep 06 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.99.20120822-2
+- Updated ibus-530711-preload-sys.patch
+- Updated ibus-541492-xkb.patch
+- Updated ibus-xx-no-use.diff
+  Fixed Bug 854161 - not able to add keymap with ibus-setup
+
 * Wed Aug 22 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.99.20120822-1
 - Bumped to 1.4.99.20120822
 - Bumped to ibus-gjs 3.4.1.20120815

xinput-ibus

@@ -5,6 +5,7 @@ XIM_ARGS="-r --xim"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
 SHORT_DESC="IBus"
 GTK_IM_MODULE=ibus
+NOT_RUN=gnome3
 
 if test -f /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so || \
    test -f /usr/lib64/qt4/plugins/inputmethods/libqtim-ibus.so;