- Add patch to fix deprecated function

f38
John (J5) Palmieri 19 years ago
parent 338997af49
commit 3b705f0fb0

@ -0,0 +1,87 @@
--- 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;
}

@ -13,7 +13,7 @@
Summary: The GNOME virtual file-system libraries Summary: The GNOME virtual file-system libraries
Name: gnome-vfs2 Name: gnome-vfs2
Version: 2.15.3 Version: 2.15.3
Release: 3 Release: 4
License: LGPL License: LGPL
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: gnome-vfs-%{version}.tar.bz2 Source0: gnome-vfs-%{version}.tar.bz2
@ -58,6 +58,8 @@ Patch201: gnome-vfs-2.8.1-console-mount-opt.patch
Patch4: gnome-vfs-2.15.1-use-sys-inotify.patch Patch4: gnome-vfs-2.15.1-use-sys-inotify.patch
Patch5: gnome-vfs-2.15.3-dbus-deprecated.patch
%description %description
GNOME VFS is the GNOME virtual file system. It is the foundation of GNOME VFS is the GNOME virtual file system. It is the foundation of
the Nautilus file manager. It provides a modular architecture and the Nautilus file manager. It provides a modular architecture and
@ -99,6 +101,8 @@ shares (SMB) to applications using GNOME VFS.
%patch4 -p1 -b .use-sys-inotify %patch4 -p1 -b .use-sys-inotify
%patch5 -p1 -b .dbus-deprecated
# send to upstream # send to upstream
%patch101 -p1 -b .schema_about %patch101 -p1 -b .schema_about
@ -189,6 +193,9 @@ done
%config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
%changelog %changelog
* Tue Jul 18 2006 John (J5) Palmieri <johnp@redhat.com> - 2.15.3-4
- Add patch to fix deprecated function
* Tue Jul 18 2006 John (J5) Palmieri <johnp@redhat.com> - 2.15.3-3 * Tue Jul 18 2006 John (J5) Palmieri <johnp@redhat.com> - 2.15.3-3
- Add BR for dbus-glib-devel - Add BR for dbus-glib-devel

Loading…
Cancel
Save