X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-maemo-utils.c;fp=src%2Fhildon2%2Fmodest-maemo-utils.c;h=b9f89d78aef56be70f091a8e384f625c1670ad3b;hp=4a17ebd543b5216db5409220f83f5c567b4aaf23;hb=81307d447e9fa67d5df56fcd36ea908d993157d0;hpb=2064f741529da69844c75001c8af22684b9108de

diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c
index 4a17ebd..b9f89d7 100644
--- a/src/hildon2/modest-maemo-utils.c
+++ b/src/hildon2/modest-maemo-utils.c
@@ -141,39 +141,32 @@ get_properties_cb (DBusMessage *message)
 }
 
 static void
-get_default_adapter_cb (DBusMessage *message)
+get_default_adapter_cb (DBusConnection *conn,
+			DBusMessage *message)
 {
 	DBusMessageIter iter;
 	gchar* path = NULL;
+	DBusError error;
+	DBusMessage *msg, *adapterMsg;
 
 	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");
-
-		conn = dbus_bus_get (DBUS_BUS_SYSTEM, NULL);
-
-		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");
+
+	if (!path)
+		return;
+
+	adapterMsg = dbus_message_new_method_call ("org.bluez", path,
+						   "org.bluez.Adapter",
+						   "GetProperties");
+
+	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_message_unref (adapterMsg);
 }
 
 void
@@ -203,11 +196,10 @@ modest_maemo_utils_get_device_name (void)
 	msg = dbus_connection_send_with_reply_and_block (conn, request, -1, &error);
 	if (msg) {
 		g_debug ("Getting the default adapter");
-		get_default_adapter_cb (msg);
+		get_default_adapter_cb (conn, msg);
 		dbus_message_unref (msg);
 	}
 	dbus_message_unref (request);
-	dbus_connection_unref (conn);
 }
 
 void