gvfs r1738 - in branches/gnome-2-22: . client

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Apr 16 04:09:17 2008
New Revision: 1738
URL: http://svn.gnome.org/viewvc/gvfs?rev=1738&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:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/client/gdaemonvfs.c

Modified: branches/gnome-2-22/client/gdaemonvfs.c
==============================================================================
--- branches/gnome-2-22/client/gdaemonvfs.c	(original)
+++ branches/gnome-2-22/client/gdaemonvfs.c	Wed Apr 16 04:09:17 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));