diff options
| -rw-r--r-- | client/gdaemonmount.c | 3 | ||||
| -rw-r--r-- | common/gmountsource.c | 9 | ||||
| -rw-r--r-- | common/gvfsdaemonprotocol.h | 4 |
3 files changed, 9 insertions, 7 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), diff --git a/common/gmountsource.c b/common/gmountsource.c index e7f7d732..1f2014de 100644 --- a/common/gmountsource.c +++ b/common/gmountsource.c @@ -25,6 +25,7 @@ #include <gmountsource.h> #include <gio/gio.h> #include <gvfsdbus.h> +#include "gvfsdaemonprotocol.h" #include <string.h> @@ -280,7 +281,7 @@ g_mount_source_ask_password_async (GMountSource *source, return; /* 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); result = g_simple_async_result_new (G_OBJECT (source), callback, user_data, g_mount_source_ask_password_async); @@ -618,7 +619,7 @@ g_mount_source_ask_question_async (GMountSource *source, return; /* 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); result = g_simple_async_result_new (G_OBJECT (source), callback, user_data, g_mount_source_ask_question_async); @@ -778,7 +779,7 @@ g_mount_source_show_processes_async (GMountSource *source, return; /* 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); result = g_simple_async_result_new (G_OBJECT (source), callback, user_data, g_mount_source_show_processes_async); @@ -955,7 +956,7 @@ g_mount_source_show_unmount_progress (GMountSource *source, return; /* 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_operation_call_show_unmount_progress (proxy, message_string ? message_string : "", diff --git a/common/gvfsdaemonprotocol.h b/common/gvfsdaemonprotocol.h index e74a5d24..218691ac 100644 --- a/common/gvfsdaemonprotocol.h +++ b/common/gvfsdaemonprotocol.h @@ -14,8 +14,8 @@ G_BEGIN_DECLS #define G_VFS_DBUS_METADATA_NAME "org.gtk.vfs.Metadata" #define G_VFS_DBUS_METADATA_PATH "/org/gtk/vfs/metadata" -/* Mounts time out in 10 minutes, since they can be slow, with auth, etc */ -#define G_VFS_DBUS_MOUNT_TIMEOUT_MSECS (1000*60*10) +/* Mounts time out in 30 minutes, since they can be slow, with auth, etc */ +#define G_VFS_DBUS_MOUNT_TIMEOUT_MSECS (1000*60*30) /* Normal ops are faster, one minute timeout */ #define G_VFS_DBUS_TIMEOUT_MSECS (1000*60) |