rpms/imsettings/F-12 imsettings-fix-segv-on-xfce-helper.patch, NONE, 1.1 imsettings.spec, 1.46, 1.47

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15663

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-fix-segv-on-xfce-helper.patch 
Log Message:
* Tue Nov 24 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-4
- Fix a segfault issue on XFCE desktop. (#540062)

imsettings-fix-segv-on-xfce-helper.patch:
 main.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE imsettings-fix-segv-on-xfce-helper.patch ---
Index: backends/xfce_xfconf/main.c
===================================================================
--- backends/xfce_xfconf/main.c	(リビジョン 363)
+++ backends/xfce_xfconf/main.c	(作業コピー)
@@ -57,7 +57,7 @@
 main(int argc, char **argv)
 {
 	GError *error = NULL;
-	GConfClient *client = gconf_client_get_default();
+	GConfClient *client = NULL;
 	GMainLoop *loop;
 	GConfEntry *entry;
 	guint ctxt_id;
@@ -68,6 +68,11 @@
 		return 1;
 	}
 
+	client = gconf_client_get_default();
+	if (client == NULL) {
+		g_printerr("Failed to obtain the default GConfClient instance.\n");
+		goto end;
+	}
 	gconf_client_add_dir(client, "/desktop/gnome/interface",
 			     GCONF_CLIENT_PRELOAD_ONELEVEL, &error);
 	if (error) {
@@ -93,7 +98,8 @@
 	loop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(loop);
   end:
-	g_object_unref(client);
+	if (client)
+		g_object_unref(client);
 	xfconf_shutdown();
 
 	return 0;


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-12/imsettings.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- imsettings.spec	2 Nov 2009 08:02:39 -0000	1.46
+++ imsettings.spec	24 Nov 2009 09:53:04 -0000	1.47
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,6 +19,7 @@ Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-none.conf-gtk-xim-default.patch
+Patch3:		imsettings-fix-segv-on-xfce-helper.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -88,6 +89,7 @@ This package contains a plugin to get th
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
 %patch2 -p1 -b .2-xim
+%patch3 -p0 -b .3-xfce
 
 %build
 %configure	\
@@ -213,6 +215,9 @@ fi
 
 
 %changelog
+* Tue Nov 24 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-4
+- Fix a segfault issue on XFCE desktop. (#540062)
+
 * Mon Nov  2 2009 Jens Petersen <petersen at redhat.com> - 0.107.4-3
 - none.conf: default GTK to xim if available like qt does to fix
   current missing X locale compose for gtk and X (#505100)