rpms/imsettings/F-12 imsettings-fix-gconf-abort.patch, NONE, 1.1 imsettings.spec, 1.48, 1.49

[Akira TAGOH]

Author: tagoh

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

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-fix-gconf-abort.patch 
Log Message:
* Fri Feb  5 2010 Akira TAGOH <tagoh at redhat.com> - 0.107.4-6
- Fix an abort issue on GConf backend. (#543005)

imsettings-fix-gconf-abort.patch:
 main.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE imsettings-fix-gconf-abort.patch ---
2010-02-05  Akira TAGOH  <tagoh at redhat.com>

	* backends/gconf/main.c (main): avoid a crash when the session bus
	isn't yet established or terminated. (rhbz#543005)

Index: backends/gconf/main.c
===================================================================
--- backends/gconf/main.c	(リビジョン 368)
+++ backends/gconf/main.c	(作業コピー)
@@ -213,6 +213,10 @@
 
 	gconn = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
 	conn = dbus_g_connection_get_connection(gconn);
+	if (conn == NULL) {
+		g_printerr("DBus session isn't yet established.\n");
+		return 1;
+	}
 
 	flags = DBUS_NAME_FLAG_ALLOW_REPLACEMENT | DBUS_NAME_FLAG_DO_NOT_QUEUE;
 	if (arg_replace) {


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-12/imsettings.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- imsettings.spec	4 Jan 2010 10:00:53 -0000	1.48
+++ imsettings.spec	5 Feb 2010 12:46:41 -0000	1.49
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,7 @@ Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-none.conf-gtk-xim-default.patch
 Patch3:		imsettings-fix-segv-on-xfce-helper.patch
 Patch4:		imsettings-fix-segfault-on-dbus.patch
+Patch5:		imsettings-fix-gconf-abort.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -92,6 +93,7 @@ This package contains a plugin to get th
 %patch2 -p1 -b .2-xim
 %patch3 -p0 -b .3-xfce
 %patch4 -p0 -b .4-dbus
+%patch5 -p0 -b .5-gconf
 
 %build
 %configure	\
@@ -217,6 +219,9 @@ fi
 
 
 %changelog
+* Fri Feb  5 2010 Akira TAGOH <tagoh at redhat.com> - 0.107.4-6
+- Fix an abort issue on GConf backend. (#543005)
+
 * Mon Jan  4 2010 Akira TAGOH <tagoh at redhat.com> - 0.107.4-5
 - Fix an abort issue. (#530357)