gvfs r1752 - in branches/gnome-2-22: . client hal

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Apr 21 14:49:55 2008
New Revision: 1752
URL: http://svn.gnome.org/viewvc/gvfs?rev=1752&view=rev

Log:
2008-04-21  Matthias Clasen  <mclasen redhat com>

        * client/gdaemonvfs.c:
        * hal/hal-pool.c: Set exit-on-disconnect to FALSE on private
        dbus connections to prevent unexpected exits.  (#528785)



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/client/gdaemonvfs.c
   branches/gnome-2-22/hal/hal-pool.c

Modified: branches/gnome-2-22/client/gdaemonvfs.c
==============================================================================
--- branches/gnome-2-22/client/gdaemonvfs.c	(original)
+++ branches/gnome-2-22/client/gdaemonvfs.c	Mon Apr 21 14:49:55 2008
@@ -298,6 +298,8 @@
   
   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);

Modified: branches/gnome-2-22/hal/hal-pool.c
==============================================================================
--- branches/gnome-2-22/hal/hal-pool.c	(original)
+++ branches/gnome-2-22/hal/hal-pool.c	Mon Apr 21 14:49:55 2008
@@ -308,6 +308,8 @@
       goto out;
     }
   
+  dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
+
   hal_ctx = libhal_ctx_new ();
   if (hal_ctx == NULL)
     {