rpms/imsettings/F-12 imsettings-fix-segfault-on-dbus.patch, NONE, 1.1 imsettings.spec, 1.47, 1.48

[Akira TAGOH]

Author: tagoh

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

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-fix-segfault-on-dbus.patch 
Log Message:
* Mon Jan  4 2010 Akira TAGOH <tagoh at redhat.com> - 0.107.4-5
- Fix an abort issue. (#530357)

imsettings-fix-segfault-on-dbus.patch:
 factory.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE imsettings-fix-segfault-on-dbus.patch ---
 2010-01-04  Akira TAGOH  <tagoh at redhat.com>
 
	* src/factory.c (imsettings_manager_real_finalize): avoid a segfault
	in libnotify when the dbus session is being closed. (rhbz#530357)

Index: src/factory.c
===================================================================
--- src/factory.c	(リビジョン 368)
+++ src/factory.c	(作業コピー)
@@ -871,6 +871,11 @@
 		g_object_unref(priv->xim_req);
 	if (priv->qt_req)
 		g_object_unref(priv->qt_req);
+	if (priv->notify) {
+		/* XXX: workaround to avoid aborting on dbus. */
+		if (dbus_connection_get_is_connected(priv->req_conn))
+			g_object_unref(priv->notify);
+	}
 	dbus_connection_unref(priv->req_conn);
 	if (priv->monitor)
 		g_object_unref(priv->monitor);
@@ -882,8 +889,6 @@
 		g_hash_table_destroy(priv->aux2info);
 	if (priv->body2info)
 		g_hash_table_destroy(priv->body2info);
-	if (priv->notify)
-		g_object_unref(priv->notify);
 
 	if (G_OBJECT_CLASS (imsettings_manager_parent_class)->finalize)
 		G_OBJECT_CLASS (imsettings_manager_parent_class)->finalize(object);


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-12/imsettings.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- imsettings.spec	24 Nov 2009 09:53:04 -0000	1.47
+++ imsettings.spec	4 Jan 2010 10:00:53 -0000	1.48
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,6 +20,7 @@ Patch0:		imsettings-constraint-of-langua
 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
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -90,6 +91,7 @@ This package contains a plugin to get th
 %patch1 -p1 -b .1-xim
 %patch2 -p1 -b .2-xim
 %patch3 -p0 -b .3-xfce
+%patch4 -p0 -b .4-dbus
 
 %build
 %configure	\
@@ -215,6 +217,9 @@ fi
 
 
 %changelog
+* Mon Jan  4 2010 Akira TAGOH <tagoh at redhat.com> - 0.107.4-5
+- Fix an abort issue. (#530357)
+
 * Tue Nov 24 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-4
 - Fix a segfault issue on XFCE desktop. (#540062)