From 83e3ede47d454f99f1fa32b80b3dfaeb37b8f557 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sergio=20Villar=20Sen=C3=ADn?= <svillar@igalia.com>
Date: Tue, 19 May 2009 14:03:03 +0200
Subject: [PATCH] Fixes NB#113242, use
 dbus_connection_send_with_reply_and_block to prevent
 crashes for using DBus in multithreaded environments when
 retrieving the device dbus name

---
 src/hildon2/modest-maemo-utils.c |   66 +++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 37 deletions(-)

diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c
index dfd2658..4a17ebd 100644
--- a/src/hildon2/modest-maemo-utils.c
+++ b/src/hildon2/modest-maemo-utils.c
@@ -77,32 +77,20 @@ modest_maemo_utils_set_osso_context (osso_context_t *osso_context)
 }
 
 static void
-get_properties_cb (DBusPendingCall *call,
-		   void *user_data)
+get_properties_cb (DBusMessage *message)
 {
 	DBusMessageIter iter;
 	DBusMessageIter dict_iter;
 	DBusMessageIter dict_entry_iter;
 	DBusError err;
 	gchar *bt_name = NULL;
-	DBusMessage *message;
 	int key_type, array_type, msg_type;
 
-	if ( !dbus_pending_call_get_completed ( call ) )
-		g_warning ("%s: Call not completed!", __FUNCTION__);
-
-	message = dbus_pending_call_steal_reply ( call );
-
-	if (message == NULL)
-		g_warning ("%s: Message is NULL", __FUNCTION__);
-
-
 	dbus_error_init(&err);
 	if (dbus_set_error_from_message (&err, message)) {
 		g_warning ("%s: %s", __FUNCTION__, err.message);
 	}
 
-
 	/* Get msg type */
 	dbus_message_iter_init (message, &iter);
 	msg_type = dbus_message_iter_get_arg_type (&iter);
@@ -153,34 +141,36 @@ get_properties_cb (DBusPendingCall *call,
 }
 
 static void
-get_default_adapter_cb (DBusPendingCall *call,
-			void *user_data)
+get_default_adapter_cb (DBusMessage *message)
 {
-	DBusMessage *message;
 	DBusMessageIter iter;
 	gchar* path = NULL;
 
-	message = dbus_pending_call_steal_reply(call);
-
-	// Todo extract msg info from here
-	dbus_message_iter_init ( message, &iter );
+	dbus_message_iter_init (message, &iter);
 
 	dbus_message_iter_get_basic (&iter, &path);
 	if (path != NULL) {
+		DBusError error;
 		DBusConnection *conn;
-		DBusMessage *adapterMsg = dbus_message_new_method_call("org.bluez", path,
-								       "org.bluez.Adapter",
-								       "GetProperties");
-		DBusPendingCall *call = NULL;
+		DBusMessage *adapterMsg = dbus_message_new_method_call ("org.bluez", path,
+									"org.bluez.Adapter",
+									"GetProperties");
 
 		conn = dbus_bus_get (DBUS_BUS_SYSTEM, NULL);
 
-		if (conn && dbus_connection_send_with_reply(conn, adapterMsg, &call, -1) ) {
-			g_debug ("Getting the properties");
-			dbus_pending_call_set_notify(call, get_properties_cb, NULL, NULL);
-			dbus_pending_call_block(call);
-			dbus_pending_call_unref(call);
+		if (conn) {
+			DBusMessage *msg;
+
+			dbus_error_init (&error);
+			msg = dbus_connection_send_with_reply_and_block (conn, adapterMsg, -1, &error);
+			if (msg) {
+				g_debug ("Getting the properties");
+				get_properties_cb (msg);
+				dbus_message_unref (msg);
+			}
+			dbus_connection_unref (conn);
 		}
+		dbus_message_unref (adapterMsg);
 	} else {
 		g_warning ("Failed to get the default bluetooth adapter");
 	}
@@ -192,7 +182,7 @@ modest_maemo_utils_get_device_name (void)
 	static DBusConnection *conn = NULL;
 	DBusMessage *request;
 	DBusError error;
-	DBusPendingCall *call = NULL;
+	DBusMessage *msg;
 
 	dbus_error_init (&error);
 	if (!conn) {
@@ -206,16 +196,18 @@ modest_maemo_utils_get_device_name (void)
 	}
 
 	/* Get the default adapter */
-	request = dbus_message_new_method_call("org.bluez", "/" ,
-					       "org.bluez.Manager",
-					       "DefaultAdapter");
+	request = dbus_message_new_method_call ("org.bluez", "/" ,
+						"org.bluez.Manager",
+						"DefaultAdapter");
 
-	if (dbus_connection_send_with_reply(conn, request, &call, -1)) {
+	msg = dbus_connection_send_with_reply_and_block (conn, request, -1, &error);
+	if (msg) {
 		g_debug ("Getting the default adapter");
-		dbus_pending_call_set_notify(call, get_default_adapter_cb, NULL, NULL);
-		dbus_pending_call_block(call);
-		dbus_pending_call_unref(call);
+		get_default_adapter_cb (msg);
+		dbus_message_unref (msg);
 	}
+	dbus_message_unref (request);
+	dbus_connection_unref (conn);
 }
 
 void
-- 
1.7.9.5