rpms/imsettings/devel imsettings-immodule-conf.patch, NONE, 1.1 imsettings.spec, 1.29, 1.30 noautobuild, 1.1, NONE

[Akira TAGOH]

Author: tagoh

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

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-immodule-conf.patch 
Removed Files:
	noautobuild 
Log Message:
remove noautobuild

imsettings-immodule-conf.patch:
 factory.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE imsettings-immodule-conf.patch ---
2009-07-23  Akira TAGOH  <tagoh at redhat.com>

	* src/factory.c (imsettings_manager_real_whats_im_running): Support
	immodule only configuration file.

Index: src/factory.c
===================================================================
--- src/factory.c	(リビジョン 299)
+++ src/factory.c	(作業コピー)
@@ -797,7 +797,7 @@
 	IMSettingsManagerPrivate *priv = IMSETTINGS_MANAGER_GET_PRIVATE (observer);
 	IMSettingsInfo *info = NULL;
 	gchar *module, *pidfile = NULL;
-	const gchar *xinputfile;
+	const gchar *xinputfile, *xim, *gtkimm;
 	pid_t pid;
 
 	module = imsettings_manager_real_get_current_user_im(observer, error);
@@ -823,6 +823,17 @@
 		pidfile = _build_pidfilename(xinputfile, priv->display_name, "xim");
 		pid = _get_pid(pidfile, "xim", error);
 		if (pid == 0) {
+			/* for immodules */
+			xim = imsettings_info_get_xim(info);
+			if (xim != NULL && strcmp(xim, "none") == 0) {
+				gtkimm = imsettings_info_get_gtkimm(info);
+				if (strcmp(gtkimm, "gtk-im-context-simple") != 0) {
+					/* this may be an immodule that is only available for gtk+ */
+					g_error_free(*error);
+					*error = NULL;
+					goto end;
+				}
+			}
 			if (g_error_matches(*error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
 				/* No pidfile is available. there aren't anything else to do.
 				 * basically this is no problem. someone may just did stop an IM


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- imsettings.spec	13 Apr 2009 11:11:41 -0000	1.29
+++ imsettings.spec	24 Jul 2009 00:49:44 -0000	1.30
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.106.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,6 +16,7 @@ Source0:	http://imsettings.googlecode.co
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
+Patch2:		imsettings-immodule-conf.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -82,6 +83,7 @@ This package contains a plugin to get th
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
+%patch2 -p0 -b .2-immodule
 
 %build
 %configure	\
@@ -201,6 +203,9 @@ fi
 
 
 %changelog
+* Thu Jul 23 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-3
+- Support immodule only configuration file.
+
 * Mon Apr 13 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-2
 - Disable applet by default.
 


--- noautobuild DELETED ---