rpms/gvfs/devel gvfs-dbus-exit.patch,NONE,1.1 gvfs.spec,1.47,1.48

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19527

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-dbus-exit.patch 
Log Message:
fix threading and dbus issues


gvfs-dbus-exit.patch:

--- NEW FILE gvfs-dbus-exit.patch ---
diff -up gvfs-0.2.3/client/gdaemonvfs.c.dbus-exit gvfs-0.2.3/client/gdaemonvfs.c
--- gvfs-0.2.3/client/gdaemonvfs.c.dbus-exit	2008-04-18 21:29:52.000000000 -0400
+++ gvfs-0.2.3/client/gdaemonvfs.c	2008-04-18 21:29:28.000000000 -0400
@@ -298,6 +298,8 @@ g_daemon_vfs_init (GDaemonVfs *vfs)
   
   vfs->wrapped_vfs = g_vfs_get_local ();
 
+  dbus_connection_set_exit_on_disconnect (vfs->async_bus, FALSE);
+
   _g_dbus_connection_integrate_with_main (vfs->async_bus);
 
   modules = g_io_modules_load_all_in_directory (GVFS_MODULE_DIR);
diff -up gvfs-0.2.3/hal/hal-pool.c.dbus-exit gvfs-0.2.3/hal/hal-pool.c
--- gvfs-0.2.3/hal/hal-pool.c.dbus-exit	2008-04-18 21:27:36.000000000 -0400
+++ gvfs-0.2.3/hal/hal-pool.c	2008-04-18 21:28:05.000000000 -0400
@@ -308,6 +308,8 @@ hal_pool_new (char **cap_only)
       goto out;
     }
   
+  dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
+
   hal_ctx = libhal_ctx_new ();
   if (hal_ctx == NULL)
     {


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gvfs.spec	19 Apr 2008 01:17:52 -0000	1.47
+++ gvfs.spec	19 Apr 2008 01:41:15 -0000	1.48
@@ -44,6 +44,9 @@
 # http://mail.gnome.org/archives/gvfs-list/2008-April/msg00017.html
 Patch8: gvfs-fuse-threading.patch
 
+#
+Patch9: gvfs-dbus-exit.patch
+
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -79,6 +82,7 @@
 %patch6 -p1 -b .gphoto-automount
 %patch7 -p1 -b .unmount-scheme
 %patch8 -p0 -b .fuse-threading
+%patch9 -p1 -b .dbus-exit
 
 %build
 
@@ -184,6 +188,7 @@
 %dir %{_includedir}/gvfs-client/gvfs
 %{_includedir}/gvfs-client/gvfs/gvfsurimapper.h
 %{_includedir}/gvfs-client/gvfs/gvfsuriutils.h
+%{_libdir}/libgvfscommon.so
 
 
 %files fuse
@@ -194,6 +199,7 @@
 %changelog
 * Fri Apr 18 2008 Matthias Clasen <mclasen at redhat.com> - 0.2.3-8
 - Fix thread-safety issues in gvfs-fuse-daemon
+- Prevent dbus from shutting us down unexpectedly
 
 * Thu Apr 17 2008 David Zeuthen <davidz at redhat.com> - 0.2.3-7
 - Put X-Gnome-Vfs-System=gio into mount-archarive.desktop (See #442835)