rpms/gnome-vfs2/devel gnome-vfs-2.15.3-dbus-deprecated.patch, NONE, 1.1 gnome-vfs2.spec, 1.119, 1.120

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28268

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.15.3-dbus-deprecated.patch 
Log Message:
- Add patch to fix deprecated function


gnome-vfs-2.15.3-dbus-deprecated.patch:
 daemon/daemon-connection.c            |    2 +-
 daemon/vfs-daemon.c                   |   10 +++++-----
 libgnomevfs/gnome-vfs-daemon-method.c |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE gnome-vfs-2.15.3-dbus-deprecated.patch ---
--- gnome-vfs-2.15.3/daemon/vfs-daemon.c.dbus-deprecated	2006-07-18 19:43:49.000000000 -0400
+++ gnome-vfs-2.15.3/daemon/vfs-daemon.c	2006-07-18 19:45:55.000000000 -0400
@@ -108,7 +108,7 @@
 		g_warning ("Failed to acquire vfs-daemon service: %s", error.message);
 		dbus_error_free (&error);
 
-		dbus_connection_disconnect (conn);
+		dbus_connection_close (conn);
 		/* Remove this, it asserts:
 		   dbus_connection_unref (conn); */
 		conn = NULL;
@@ -119,7 +119,7 @@
 	if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) {
 		g_printerr ("VFS daemon already running, exiting.\n");
 
-		dbus_connection_disconnect (conn);
+		dbus_connection_close (conn);
 		/* Remove this, it asserts:
 		   dbus_connection_unref (conn); */
 		conn = NULL;
@@ -130,7 +130,7 @@
 	if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
 		g_printerr ("Not primary owner of the service, exiting.\n");
 
-		dbus_connection_disconnect (conn);
+		dbus_connection_close (conn);
 		/* Remove this, it asserts:
 		   dbus_connection_unref (conn); */
 		conn = NULL;
@@ -149,7 +149,7 @@
 						   NULL)) {
 		g_printerr ("Failed to register object with D-BUS.\n");
 
-		dbus_connection_disconnect (conn);
+		dbus_connection_close (conn);
 		dbus_connection_unref (conn);
 		conn = NULL;
 
@@ -177,7 +177,7 @@
 		return;
 	}
 
-	dbus_connection_disconnect (conn);
+	dbus_connection_close (conn);
 	dbus_connection_unref (conn);
 }
 
--- gnome-vfs-2.15.3/daemon/daemon-connection.c.dbus-deprecated	2006-07-18 19:46:14.000000000 -0400
+++ gnome-vfs-2.15.3/daemon/daemon-connection.c	2006-07-18 19:46:29.000000000 -0400
@@ -218,7 +218,7 @@
 	d(g_print ("Connection destroy\n"));
 
 	if (dbus_connection_get_is_connected (conn->conn)) {
-		dbus_connection_disconnect (conn->conn);
+		dbus_connection_close (conn->conn);
 	}
 	dbus_connection_unref (conn->conn);
 
--- gnome-vfs-2.15.3/libgnomevfs/gnome-vfs-daemon-method.c.dbus-deprecated	2006-07-18 19:46:49.000000000 -0400
+++ gnome-vfs-2.15.3/libgnomevfs/gnome-vfs-daemon-method.c	2006-07-18 19:47:16.000000000 -0400
@@ -348,7 +348,7 @@
 {
 	LocalConnection *ret = data;
 
-	dbus_connection_disconnect (ret->connection);
+	dbus_connection_close (ret->connection);
 	dbus_connection_unref (ret->connection);
 	g_free (ret);
 }
@@ -391,7 +391,7 @@
 							   -1,
 							   &error);
 	dbus_message_unref (message);
-	dbus_connection_disconnect (main_conn);
+	dbus_connection_close (main_conn);
 	dbus_connection_unref (main_conn);
 	if (!reply) {
 		g_warning ("Error while getting peer-to-peer connection: %s",
@@ -421,7 +421,7 @@
 						   &connection_vtable,
 						   NULL)) {
 		g_warning ("Failed to register client object with the connection.");
-		dbus_connection_disconnect (private_conn);
+		dbus_connection_close (private_conn);
 		dbus_connection_unref (private_conn);
 		return NULL;
 	}


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gnome-vfs2.spec	18 Jul 2006 23:06:29 -0000	1.119
+++ gnome-vfs2.spec	18 Jul 2006 23:50:26 -0000	1.120
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.3
-Release: 3 
+Release: 4 
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -58,6 +58,8 @@
 
 Patch4:  gnome-vfs-2.15.1-use-sys-inotify.patch
 
+Patch5: gnome-vfs-2.15.3-dbus-deprecated.patch
+
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -99,6 +101,8 @@
 
 %patch4 -p1 -b .use-sys-inotify
 
+%patch5 -p1 -b .dbus-deprecated
+
 # send to upstream
 %patch101 -p1 -b .schema_about
 
@@ -189,6 +193,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.3-4
+- Add patch to fix deprecated function
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.3-3
 - Add BR for dbus-glib-devel