rpms/imsettings/devel imsettings-r210.patch, NONE, 1.1 imsettings-constraint-of-language.patch, 1.1, 1.2 imsettings.spec, 1.18, 1.19 imsettings-disable-xim.patch, 1.1, NONE

[Akira TAGOH]

Author: tagoh

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

Modified Files:
	imsettings-constraint-of-language.patch imsettings.spec 
Added Files:
	imsettings-r210.patch 
Removed Files:
	imsettings-disable-xim.patch 
Log Message:
* Tue Oct 21 2008 Akira TAGOH <tagoh at redhat.com> - 0.105.0-4
- Read %%{_sysconfdir}/X11/xinput.d/none.conf for non-CJKI locales to make
  consistency in the status on im-chooser. so it would /disables/ IM regardless
  of what the kind of locales you use and what the kind of IM you installed.
  NOTE: if you can't input any characters with GTK application, you may
  implicitly use the different buiit-in immodule. you can modify none.conf to
  get the right thing then.
- imsettings-r210.patch: backport to allow starting none without warnings.

imsettings-r210.patch:

--- NEW FILE imsettings-r210.patch ---
2008-10-21  Akira TAGOH  <tagoh at redhat.com>

	* src/factory.c (imsettings_manager_real_start_im): allow to start none
	without any warnings.

Index: src/factory.c
===================================================================
--- src/factory.c	(revision 209)
+++ src/factory.c	(working copy)
@@ -517,19 +517,22 @@
 		pidfile = NULL;
 	}
 
-	xim_prog = imsettings_info_get_xim_program(info);
-	xim_args = imsettings_info_get_xim_args(info);
-	if (xim_prog == NULL) {
-		g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_INVALID_IMM,
-			    _("No XIM server is available in %s"), module);
-		goto end;
+	/* hack to allow starting none.conf */
+	if (strcmp(module, "none") != 0) {
+		xim_prog = imsettings_info_get_xim_program(info);
+		xim_args = imsettings_info_get_xim_args(info);
+		if (xim_prog == NULL) {
+			g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_INVALID_IMM,
+				    _("No XIM server is available in %s"), module);
+			goto end;
+		}
+		pidfile = _build_pidfilename(xinputfile, priv->display_name, "xim");
+
+		/* bring up a XIM server */
+		if (!_start_process(xim_prog, xim_args, pidfile, lang, error))
+			goto end;
 	}
-	pidfile = _build_pidfilename(xinputfile, priv->display_name, "xim");
 
-	/* bring up a XIM server */
-	if (!_start_process(xim_prog, xim_args, pidfile, lang, error))
-		goto end;
-
 	/* FIXME: We need to take care of imsettings per X screens?
 	 */
 	/* FIXME: have to deal with the errors */

imsettings-constraint-of-language.patch:

Index: imsettings-constraint-of-language.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings-constraint-of-language.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imsettings-constraint-of-language.patch	16 Jun 2008 03:13:21 -0000	1.1
+++ imsettings-constraint-of-language.patch	21 Oct 2008 08:56:42 -0000	1.2
@@ -1,19 +1,25 @@
-diff -ruN imsettings-0.101.1.orig/data/xinput.sh.in.in imsettings-0.101.1/data/xinput.sh.in.in
---- imsettings-0.101.1.orig/data/xinput.sh.in.in	2008-06-03 20:53:49.000000000 +0900
-+++ imsettings-0.101.1/data/xinput.sh.in.in	2008-06-12 23:03:51.000000000 +0900
-@@ -43,7 +43,14 @@
+diff -ruN imsettings-0.105.0.orig/data/xinput.sh.in.in imsettings-0.105.0/data/xinput.sh.in.in
+--- imsettings-0.105.0.orig/data/xinput.sh.in.in	2008-10-11 14:54:28.000000000 +0900
++++ imsettings-0.105.0/data/xinput.sh.in.in	2008-10-21 14:57:51.000000000 +0900
+@@ -152,7 +152,20 @@
  	SHORT_DESC="User Specific"
      fi
  elif [ -r "$SYS_XINPUTRC" ]; then
 -    source "$SYS_XINPUTRC"
 +    # FIXME: This hardcoded list has to be gone in the future.
 +    _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh"
++    _sourced_xinputrc=0
 +    for i in $_language_list; do
 +        if echo $tmplang | grep -q -E "^$i"; then
 +            source "$SYS_XINPUTRC"
++            _sourced_xinputrc=1
 +            break
 +        fi
 +    done
++    if [ $_sourced_xinputrc -eq 0 ]; then
++        # Read none.conf to set up properly for locales not listed the above.
++        source @XINPUT_PATH@/none.conf
++    fi
  fi
  
  [ -z "$XIM" ] && XIM=none


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- imsettings.spec	17 Oct 2008 15:07:09 -0000	1.18
+++ imsettings.spec	21 Oct 2008 08:56:42 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.105.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,7 +14,7 @@
 # workaround for KDE, it will be removed when we have a correct fix
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
-Patch1:		imsettings-disable-xim.patch
+Patch1:		imsettings-r210.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -79,7 +79,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .0-lang
-#%%patch1 -p1 -b .1-xim
+%patch1 -p0 -b .1-allow-none-to-start
 
 %build
 %configure	\
@@ -187,6 +187,15 @@
 
 
 %changelog
+* Tue Oct 21 2008 Akira TAGOH <tagoh at redhat.com> - 0.105.0-4
+- Read %%{_sysconfdir}/X11/xinput.d/none.conf for non-CJKI locales to make
+  consistency in the status on im-chooser. so it would /disables/ IM regardless
+  of what the kind of locales you use and what the kind of IM you installed.
+  NOTE: if you can't input any characters with GTK+ application, you may
+  implicitly use the different buiit-in immodule. you can modify none.conf to
+  get the right thing then.
+- imsettings-r210.patch: backport to allow starting none without warnings.
+
 * Fri Oct 17 2008 Than Ngo <than at redhat.com> 0.105.0-3
 - readd the workaround for KDE
 


--- imsettings-disable-xim.patch DELETED ---