gvfs r1737 - in trunk: . client

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Apr 16 04:06:33 2008
New Revision: 1737
URL: http://svn.gnome.org/viewvc/gvfs?rev=1737&view=rev

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

        Bug 526454 â too early use of dbus session bus

        * client/gdaemonvfs.c (g_io_module_load): Refuse to load if
        there is no session bus.




Modified:
   trunk/ChangeLog
   trunk/client/gdaemonvfs.c

Modified: trunk/client/gdaemonvfs.c
==============================================================================
--- trunk/client/gdaemonvfs.c	(original)
+++ trunk/client/gdaemonvfs.c	Wed Apr 16 04:06:33 2008
@@ -950,6 +950,13 @@
 void
 g_io_module_load (GIOModule *module)
 {
+  /* This is so that system daemons can use gio
+   * without spawning private dbus instances.
+   * See bug 526454.
+   */
+  if (g_getenv ("DBUS_SESSION_BUS_ADDRESS") == NULL) 
+    return;
+
   g_daemon_vfs_register_type (G_TYPE_MODULE (module));
   g_daemon_volume_monitor_register_types (G_TYPE_MODULE (module));