summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2008-03-04 15:05:01 +0000
committerAlexander Larsson <alexl@src.gnome.org>2008-03-04 15:05:01 +0000
commitbf863d8ce404b5cb1fd923c09096435609021cb4 (patch)
tree1704a27f6cab0f8229aa5c48c90f830dd1a0a228
parent1aae86fdde18874452187a3e4f52555181d18b8b (diff)
downloadgvfs-bf863d8ce404b5cb1fd923c09096435609021cb4.tar.gz
Bump timeout to standard gvfs time. Patch from Matthias Clasen
2008-03-04 Alexander Larsson <alexl@redhat.com> * client/gdaemonvfs.c (_g_daemon_vfs_get_mount_info_async): Bump timeout to standard gvfs time. Patch from Matthias Clasen svn path=/trunk/; revision=1534
-rw-r--r--ChangeLog6
-rw-r--r--client/gdaemonvfs.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 760b6f30..110c7e29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-03-04 Alexander Larsson <alexl@redhat.com>
+ * client/gdaemonvfs.c (_g_daemon_vfs_get_mount_info_async):
+ Bump timeout to standard gvfs time.
+ Patch from Matthias Clasen
+
+2008-03-04 Alexander Larsson <alexl@redhat.com>
+
* hal/ghalvolumemonitor.c:
(update_all):
Actually emit changes for volumes and mounts too
diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
index ec00ad8a..eb2e5ab9 100644
--- a/client/gdaemonvfs.c
+++ b/client/gdaemonvfs.c
@@ -826,7 +826,7 @@ _g_daemon_vfs_get_mount_info_async (GMountSpec *spec,
data->callback = callback;
data->user_data = user_data;
- _g_dbus_connection_call_async (the_vfs->async_bus, message, 2000,
+ _g_dbus_connection_call_async (the_vfs->async_bus, message, G_VFS_DBUS_TIMEOUT_MSECS,
async_get_mount_info_response,
data);