From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 7 Aug 2009 05:14:39 +0000 (-0700)
Subject: Fix changed handling of service connect watches
X-Git-Tag: 2.0_alpha~3349
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fb2c693449cd8b4f2c54548381b3db6f1db2abe;p=framework%2Fconnectivity%2Fconnman.git

Fix changed handling of service connect watches
---

diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index bdd0b76..f1eb683 100644
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -854,9 +854,6 @@ static int bluetooth_init(void)
 		goto remove;
 	}
 
-	if (g_dbus_check_service(connection, BLUEZ_SERVICE) == TRUE)
-		bluetooth_connect(connection, NULL);
-
 	dbus_bus_add_match(connection, added_rule, NULL);
 	dbus_bus_add_match(connection, removed_rule, NULL);
 	dbus_bus_add_match(connection, adapter_rule, NULL);
diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index 7bbde7c..5f9d712 100644
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.c
@@ -1988,10 +1988,7 @@ int supplicant_register(struct supplicant_driver *driver)
 
 	driver_list = g_slist_append(driver_list, driver);
 
-	if (g_dbus_check_service(connection, SUPPLICANT_NAME) == TRUE)
-		supplicant_probe(connection, NULL);
-	else
-		supplicant_activate(connection);
+	supplicant_activate(connection);
 
 	return 0;
 }