rpms/uim/devel uim-1.4.1-m17n-not-list-nil-im.patch, NONE, 1.1 uim.spec, 1.43, 1.44

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7941

Modified Files:
	uim.spec 
Added Files:
	uim-1.4.1-m17n-not-list-nil-im.patch 
Log Message:
* Mon Aug 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-6
- uim-1.4.1-m17n-not-list-nil-im.patch: Fix appearing m17n-nil IME and crashing
  when it's selected. (#235331)

uim-1.4.1-m17n-not-list-nil-im.patch:

--- NEW FILE uim-1.4.1-m17n-not-list-nil-im.patch ---
diff -ruN uim-1.4.1.orig/uim/m17nlib.c uim-1.4.1/uim/m17nlib.c
--- uim-1.4.1.orig/uim/m17nlib.c	2007-01-07 02:43:43.000000000 +0900
+++ uim-1.4.1/uim/m17nlib.c	2007-08-20 10:26:39.000000000 +0900
@@ -201,8 +201,9 @@
   for (elm = imlist; mplist_key(elm) != Mnil; elm = mplist_next(elm)) {
     MDatabase *mdb = mplist_value(elm);
     MSymbol *tag = mdatabase_tag(mdb); /* tag[1]: lang, tag[2]: name */
+    uim_bool is_complete_im = (tag[1] != Mnil && tag[2] != Mnil);
 
-    if (tag[1] != Mnil) {
+    if (is_complete_im) {
       MInputMethod *im = minput_open_im(tag[1], tag[2], NULL);
 
       if (im)


Index: uim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uim/devel/uim.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- uim.spec	17 Aug 2007 13:29:35 -0000	1.43
+++ uim.spec	20 Aug 2007 02:08:10 -0000	1.44
@@ -3,7 +3,7 @@
 
 Name:		uim
 Version:	1.4.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -26,6 +26,7 @@
 Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.bz2
 Source1:	xinput.d-uim
 Source2:	uim-init.el
+Patch0:		uim-1.4.1-m17n-not-list-nil-im.patch
 
 
 Summary:	A multilingual input method library
@@ -167,6 +168,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch -p1 -b .m17n-nil
 
 
 %build
@@ -382,6 +384,10 @@
 %dir %{_datadir}/uim
 
 %changelog
+* Mon Aug 20 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-6
+- uim-1.4.1-m17n-not-list-nil-im.patch: Fix appearing m17n-nil IME and crashing
+  when it's selected. (#235331)
+
 * Fri Aug 10 2007 Akira TAGOH <tagoh at redhat.com> - 1.4.1-5
 - Update License tag.
 - Update BuildReq.