/srv/mercurial-server/detachablepurple: c8ddea65b554: Added a D-...

[Gilles Bedel]

Changeset: c8ddea65b5540a97c1c419b81bc5a19ef0af6b09
Author:	 Gilles Bedel <gillux at cpw.pidgin.im>
Date:	 2012-05-15 03:21 +0000
Branch:	 cpw.gillux.detachablepurple
URL: http://hg.pidgin.im/srv/mercurial-server/detachablepurple/rev/c8ddea65b554

Description:

Added a D-Bus timeout constant, set to 20 s for the moment.

diffstat:

 libpurple/dbus-server.h |  2 ++
 libpurple/pobject.c     |  4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (33 lines):

diff --git a/libpurple/dbus-server.h b/libpurple/dbus-server.h
--- a/libpurple/dbus-server.h
+++ b/libpurple/dbus-server.h
@@ -89,6 +89,8 @@
 		return FALSE; \
 	}
 
+#define DBUS_TIMEOUT_MSEC (20 * 1000)
+
 /**
    Initializes purple dbus pointer registration engine.
 
diff --git a/libpurple/pobject.c b/libpurple/pobject.c
--- a/libpurple/pobject.c
+++ b/libpurple/pobject.c
@@ -1010,7 +1010,7 @@
 	                                       iface->name, method_name,
 	                                       in_args, type_out,
 	                                       G_DBUS_CALL_FLAGS_NONE,
-	                                       -1, NULL, &error);
+	                                       DBUS_TIMEOUT_MSEC, NULL, &error);
 	if (!out_args) {
 		purple_debug_error("dbus", "Error while remotely calling %s.%s: %s",
 		                   iface->name, method_name, error->message);
@@ -1060,7 +1060,7 @@
 	                       params,
 	                       NULL,
 	                       G_DBUS_CALL_FLAGS_NONE,
-	                       -1,
+	                       DBUS_TIMEOUT_MSEC,
 	                       NULL,
 	                       set_prop_on_dbus_done,
 	                       NULL);