rpms/gnome-user-share/devel 0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch, NONE, 1.1 gnome-user-share.spec, 1.67, 1.68

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27310

Modified Files:
	gnome-user-share.spec 
Added Files:
	0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch 
Log Message:
* Tue Nov 10 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-3
- Fix crasher on exit when ObexFTP isn't started (#533977)


0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch:
 obexftp.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE 0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch ---
>From f26dd4a7ebed90d81a942f0a3cae8d741bbb4ef4 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 10 Nov 2009 16:27:13 +0000
Subject: [PATCH] Avoid crashing when dbus_g_proxy_call() fails but without an error

See https://bugzilla.redhat.com/show_bug.cgi?id=533977
---
 src/obexftp.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/obexftp.c b/src/obexftp.c
index 02e8956..1037a10 100644
--- a/src/obexftp.c
+++ b/src/obexftp.c
@@ -110,11 +110,14 @@ obexftp_stop (gboolean stop_manager)
 		return;
 
 	if (dbus_g_proxy_call (server_proxy, "Close", &err, G_TYPE_INVALID, G_TYPE_INVALID) == FALSE) {
-		if (g_error_matches (err, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION) == FALSE ||
+		if (err == NULL ||
+		    g_error_matches (err, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION) == FALSE ||
 		    dbus_g_error_has_name (err, "org.openobex.Error.NotStarted") == FALSE) {
-			g_printerr ("Stopping Bluetooth ObexFTP server failed: %s\n",
-				    err->message);
-			g_error_free (err);
+			if (err != NULL) {
+				g_printerr ("Stopping Bluetooth ObexFTP server failed: %s\n",
+					    err->message);
+				g_error_free (err);
+			}
 			return;
 		}
 		g_error_free (err);
-- 
1.6.5.2



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- gnome-user-share.spec	3 Nov 2009 03:13:27 -0000	1.67
+++ gnome-user-share.spec	10 Nov 2009 16:46:55 -0000	1.68
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.28.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -14,6 +14,8 @@ Patch1: 0001-Bug-558244-Enabling-gnome-u
 %define		_default_patch_fuzz 2
 Patch2: 0001-Use-same-directories-in-nautilus-bar-and-app.patch
 BuildRequires: intltool automake autoconf libtool
+# https://bugzilla.redhat.com/show_bug.cgi?id=533977
+Patch3: 0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +60,7 @@ The program also allows to share files u
 %patch0 -p1 -b .menu-path
 %patch1 -p1 -b .cluebar
 %patch2 -p1 -b .dirs
+%patch3 -p1 -b .exit-crash
 
 autoreconf -f -i
 
@@ -140,6 +143,9 @@ fi
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Tue Nov 10 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-3
+- Fix crasher on exit when ObexFTP isn't started (#533977)
+
 * Tue Nov 03 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
 - Update share bar code to use the same directories as
   the sharing code itself