rpms/imsettings/devel imsettings-fix-registertriggerkeys.patch, NONE, 1.1 imsettings.spec, 1.22, 1.23

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29099

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-fix-registertriggerkeys.patch 
Log Message:
* Tue Oct 28 2008 Akira TAGOH <tagoh at redhat.com> - 0.105.1-3
- imsettings-fix-registertriggerkeys.patch: Fix to send
  XIM_REGISTER_TRIGGERKEYS anyway. (#468833)

imsettings-fix-registertriggerkeys.patch:

--- NEW FILE imsettings-fix-registertriggerkeys.patch ---
Index: backends/xim/proxy.c
===================================================================
--- backends/xim/proxy.c	(リビジョン 213)
+++ backends/xim/proxy.c	(作業コピー)
@@ -1051,9 +1051,11 @@
 	GXimServerConnection *conn;
 	guint16 simid = _get_server_imid(proxy, imid);
 
-	if (simid == 0)
-		return FALSE;
-
+	/* In XIM protocol specification, it says XIM_REGISTER_TRIGGERKEYS is
+	 * sent before XIM_OPEN_REPLY. but at this moment there are no way to
+	 * determine input-method id because it will be notified to the client
+	 * through XIM_OPEN_REPLY. so imid should be always 0 then.
+	 */
 	conn = _get_server_connection(proxy, proto);
 
 	return g_xim_server_connection_cmd_register_triggerkeys(conn, simid, onkeys, offkeys);


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- imsettings.spec	27 Oct 2008 12:46:40 -0000	1.22
+++ imsettings.spec	28 Oct 2008 11:15:22 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.105.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,6 +17,7 @@
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-fix-unpredictable-session-order.patch
+Patch2:		imsettings-fix-registertriggerkeys.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -82,6 +83,7 @@
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p0 -b .1-session-order
+%patch2 -p0 -b .2-triggerkeys
 autoreconf
 
 %build
@@ -200,6 +202,10 @@
 
 
 %changelog
+* Tue Oct 28 2008 Akira TAGOH <tagoh at redhat.com> - 0.105.1-3
+- imsettings-fix-registertriggerkeys.patch: Fix to send
+  XIM_REGISTER_TRIGGERKEYS anyway. (#468833)
+
 * Mon Oct 27 2008 Akira TAGOH <tagoh at redhat.com> - 0.105.1-2
 - imsettings-fix-unpredictable-session-order.patch: Run imsettings-applet with
   --disable-xsettings for GNOME/XFCE. (#466206)