rpms/ibus/F-13 ibus-HEAD.patch,1.30,1.31 ibus.spec,1.117,1.118

[Takao Fujiwara]

Author: fujiwara

Update of /cvs/pkgs/rpms/ibus/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23981

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:

Fix next-Input-method hotkey


ibus-HEAD.patch:
 bus/ibusimpl.c |    8 ++++++++
 setup/main.py  |    8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-13/ibus-HEAD.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ibus-HEAD.patch	4 May 2010 05:41:13 -0000	1.30
+++ ibus-HEAD.patch	1 Jul 2010 09:54:06 -0000	1.31
@@ -1 +1,76 @@
+commit 817399605bdeeb83fa4729018b2b17ad7870576d
+Author: Peng Huang <shawn.p.huang at 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")


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-13/ibus.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- ibus.spec	12 Jun 2010 11:50:49 -0000	1.117
+++ ibus.spec	1 Jul 2010 09:54:07 -0000	1.118
@@ -8,14 +8,14 @@
 
 Name:       ibus
 Version:    1.3.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
-# Patch0:     ibus-HEAD.patch
+Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -106,7 +106,7 @@ The ibus-devel-docs package contains dev
 
 %prep
 %setup -q
-# %patch0 -p1
+%patch0 -p1
 
 %build
 %configure \
@@ -228,6 +228,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Jun 30 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.3.5-3
+- Add patch from HEAD.
+- Fix bug 606879 - Can not disable Alt-shift (next-Input-method) hotkey
+
 * Sat Jun 12 2010 Peng Huang <shawn.p.huang at gmail.com> - 1.3.5-2
 - Fix typo in requires.