Fix changed handling of service connect watches
authorMarcel Holtmann <marcel@holtmann.org>
Fri, 7 Aug 2009 05:14:39 +0000 (22:14 -0700)
committerMarcel Holtmann <marcel@holtmann.org>
Fri, 7 Aug 2009 05:14:39 +0000 (22:14 -0700)
plugins/bluetooth.c
plugins/supplicant.c

index bdd0b76..f1eb683 100644 (file)
@@ -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);
index 7bbde7c..5f9d712 100644 (file)
@@ -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;
 }