diff options
author | Ross Lagerwall <rosslagerwall@gmail.com> | 2015-03-08 21:39:54 +0000 |
---|---|---|
committer | Ross Lagerwall <rosslagerwall@gmail.com> | 2015-03-11 23:03:41 +0000 |
commit | c0bd3138a60b2a389ac99540ac3bfecb700ef0ff (patch) | |
tree | 8b2abd9c6f1da5c132796a071551c529bddc1056 /client | |
parent | f7f18bb6e7576672c2240c8ead8dfa4a2668d478 (diff) | |
download | gvfs-c0bd3138a60b2a389ac99540ac3bfecb700ef0ff.tar.gz |
common: Increase mount timeout to 30 minutes
Although it is probably unnecessary, wait up to 30 minutes for a mount
to complete. This allows plenty of time to wait for a password dialog.
It also makes it more consistent with many of the other operations which
use a timeout of 30 minutes.
https://bugzilla.gnome.org/show_bug.cgi?id=594500
Diffstat (limited to 'client')
-rw-r--r-- | client/gdaemonmount.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c index 97fb068d..a24a0f58 100644 --- a/client/gdaemonmount.c +++ b/client/gdaemonmount.c @@ -34,6 +34,7 @@ #include "gmountsource.h" #include "gmountoperationdbus.h" #include <gvfsdbus.h> +#include <gvfsdaemonprotocol.h> /* Protects all fields of GDaemonMount that can change which at this point is just foreign_volume */ @@ -251,7 +252,7 @@ async_proxy_new_cb (GObject *source_object, mount_source = g_mount_operation_dbus_wrap (data->mount_operation, _g_daemon_vfs_get_async_bus ()); /* 30 minute timeout */ - g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (proxy), 1000 * 60 * 30); + g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (proxy), G_VFS_DBUS_MOUNT_TIMEOUT_MSECS); gvfs_dbus_mount_call_unmount (proxy, g_mount_source_get_dbus_id (mount_source), |