summaryrefslogtreecommitdiff
path: root/gio
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2010-05-13 22:15:47 -0400
committerMatthias Clasen <mclasen@redhat.com>2010-05-13 22:15:47 -0400
commit6e8637e4783ae4e573f6784f005920930d9fca87 (patch)
tree35cef3436a13a7d41e396d02746ff62ac565afd0 /gio
parentbdc29f82d39619747ac564918e041181b26449ee (diff)
The default timeout is 25s
Diffstat (limited to 'gio')
-rw-r--r--gio/gdbusconnection.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index edebd1887..c3d17af55 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -95,11 +95,6 @@
* kind of pitfalls it avoids
* - Export objects before claiming names
* - Talk about auto-starting services (cf. GBusNameWatcherFlags)
- *
- * - Mention in all API that the GVariant is sunk. Also mention
- * when the returned GVariant is floating.
- *
- * - Consistent timeout handling (25s vs 30s?)
*/
#include "config.h"
@@ -1288,7 +1283,7 @@ g_dbus_connection_send_message_with_reply_unlocked (GDBusConnection *connect
out_serial = &serial;
if (timeout_msec == -1)
- timeout_msec = 30 * 1000; /* TODO: check 30 secs is the default timeout */
+ timeout_msec = 25 * 1000;
simple = g_simple_async_result_new (G_OBJECT (connection),
callback,