[glib/gdbus-merge] The default timeout is 25s

[Matthias Clasen <matthiasc src gnome org>]

commit 6e8637e4783ae4e573f6784f005920930d9fca87
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu May 13 22:15:47 2010 -0400

    The default timeout is 25s

 gio/gdbusconnection.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index edebd18..c3d17af 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,