diff options
| author | Alexander Larsson <alexl@redhat.com> | 2007-09-25 09:59:40 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-09-25 09:59:40 +0000 |
| commit | 1cd0ca1e977c0b5ce7253835e942ad35c420ac77 (patch) | |
| tree | b0ee29ba7e22bcd56a4c2d9171856ee4636f5376 /client/gvfsdaemondbus.c | |
| parent | bdc2cae5a5026eac1e885b1576c17e4e8b21a4c5 (diff) | |
| download | gvfs-1cd0ca1e977c0b5ce7253835e942ad35c420ac77.tar.gz | |
Pass in DBusConnection to use instead of using default one
2007-09-25 Alexander Larsson <alexl@redhat.com>
* common/gmountoperationdbus.[ch]:
* common/gmounttracker.[ch]:
Pass in DBusConnection to use instead of using default one
* client/gdaemonfile.c:
* client/gdaemonvfs.[ch]:
* client/gvfsdaemondbus.c:
Use private dbus connection even for async calls, since the
mainloop integration is conflicting with dbus-glib.
This is a temporary measure until this is solved in a better way.
* client/gdaemonvolumemonitor.c:
* client/gvfsfusedaemon.c:
* daemon/gvfsbackendsmbbrowse.c:
Update to the API changes
svn path=/trunk/; revision=959
Diffstat (limited to 'client/gvfsdaemondbus.c')
| -rw-r--r-- | client/gvfsdaemondbus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/client/gvfsdaemondbus.c b/client/gvfsdaemondbus.c index 0b58807a..f127aff4 100644 --- a/client/gvfsdaemondbus.c +++ b/client/gvfsdaemondbus.c @@ -16,6 +16,7 @@ #include <gio/gfileicon.h> #include "gvfsdaemondbus.h" #include <gvfsdaemonprotocol.h> +#include <gdaemonvfs.h> #include "gdbusutils.h" #include "gsysutils.h" @@ -564,7 +565,8 @@ open_connection_async (AsyncDBusCall *async_call) _g_dbus_oom (); - _g_dbus_connection_call_async (NULL, get_connection_message, + _g_dbus_connection_call_async (_g_daemon_vfs_get_async_bus (), + get_connection_message, G_VFS_DBUS_TIMEOUT_MSECS, async_get_connection_response, async_call); |