[imsettings] Run input methods on even non-GNOME desktops. (#920188)

[Akira TAGOH]

commit 8ff9447c6394de556518690a0debdecaecb311b1
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Tue Mar 12 13:35:14 2013 +0900

    Run input methods on even non-GNOME desktops. (#920188)

 imsettings-check-exit-status.patch |   31 +++++++++++++++++++++++++++++++
 imsettings.spec                    |    8 +++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/imsettings-check-exit-status.patch b/imsettings-check-exit-status.patch
new file mode 100644
index 0000000..711d445
--- /dev/null
+++ b/imsettings-check-exit-status.patch
@@ -0,0 +1,31 @@
+From 1988be55afb046d1ff77c7efa7ed7bad723ea831 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira at tagoh.org>
+Date: Tue, 12 Mar 2013 13:17:28 +0900
+Subject: [PATCH] check the exit status
+
+---
+ imsettings-daemon/imsettings-server.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/imsettings-daemon/imsettings-server.c b/imsettings-daemon/imsettings-server.c
+index a388004..e40f952 100644
+--- a/imsettings-daemon/imsettings-server.c
++++ b/imsettings-daemon/imsettings-server.c
+@@ -738,10 +738,13 @@ imsettings_server_cb_switch_im(IMSettingsServer  *server,
+ 		while (l && *l) {
+ 			gboolean match = FALSE;
+ 			gchar *cmd;
++			gint ret;
+ 
+ 			cmd = g_strdup_printf("%s %s", script, *l);
+-			if (g_spawn_command_line_sync(cmd, NULL, NULL, NULL, error))
++			if (g_spawn_command_line_sync(cmd, NULL, NULL, &ret, error))
+ 				match = TRUE;
++			if (!g_spawn_check_exit_status(ret, error))
++				match = FALSE;
+ 			g_free(cmd);
+ 			if (*error) {
+ 				g_clear_error(error);
+-- 
+1.8.1.4
+
diff --git a/imsettings.spec b/imsettings.spec
index 6baa925..9715fbc 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	1.6.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	LGPLv2+
 URL:		https://tagoh.bitbucket.org/%{name}/
 BuildRequires:	desktop-file-utils
@@ -19,6 +19,8 @@ Patch0:		%{name}-constraint-of-language.patch
 Patch1:		%{name}-disable-xim.patch
 ## Fedora specific: Enable xcompose for certain languages
 Patch2:		%{name}-xinput-xcompose.patch
+## backported patches
+Patch10:	%{name}-check-exit-status.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -173,6 +175,7 @@ This package contains a module to get this working on MATE.
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
 %patch2 -p1 -b .2-xcompose
+%patch10 -p1 -b .10-exit-status
 
 %build
 %configure	\
@@ -282,6 +285,9 @@ fi
 
 
 %changelog
+* Tue Mar 12 2013 Akira TAGOH <tagoh at redhat.com> - 1.6.0-3
+- Run input methods on even non-GNOME desktops. (#920188)
+
 * Tue Feb 12 2013 Kalev Lember <kalevlember at gmail.com> - 1.6.0-2
 - Correct the imsettings-gnome obsoletes version