cpw.gillux.detachablepurple: 2b071d00: Added a D-Bus timeout constant, set to 2...

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 2b071d0054b0bfbbf8b50018e477b4fac0e8de38
Parent:   39a97b12678986e427e975bdd8a33dc0bc942829
Author:   gillux at soc.pidgin.im
Date:     05/14/12 23:21:01
Branch:   im.pidgin.cpw.gillux.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/2b071d0054b0bfbbf8b50018e477b4fac0e8de38

Changelog: 

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

Changes against parent 39a97b12678986e427e975bdd8a33dc0bc942829

  patched  libpurple/dbus-server.h
  patched  libpurple/pobject.c

-------------- next part --------------
============================================================
--- libpurple/dbus-server.h	280e8a6238da96207f27de30d8caa778443fe19c
+++ libpurple/dbus-server.h	2820ba0ad924ff2a9494adc630528b543b51de4c
@@ -89,6 +89,8 @@ struct _PurpleDBusType {
 		return FALSE; \
 	}
 
+#define DBUS_TIMEOUT_MSEC (20 * 1000)
+
 /**
    Initializes purple dbus pointer registration engine.
 
============================================================
--- libpurple/pobject.c	3afd5286e61a3ecb9a107dd1a42d2143dde5f046
+++ libpurple/pobject.c	01720a2ac5f5ec24d5d0352a5d4baab2984bca09
@@ -1010,7 +1010,7 @@ purple_object_dbus_call(PurpleObject *po
 	                                       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 @@ purple_object_set_prop_on_dbus(PurpleObj
 	                       params,
 	                       NULL,
 	                       G_DBUS_CALL_FLAGS_NONE,
-	                       -1,
+	                       DBUS_TIMEOUT_MSEC,
 	                       NULL,
 	                       set_prop_on_dbus_done,
 	                       NULL);