From 5fb2c693449cd8b4f2c54548381b3db6f1db2abe Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 6 Aug 2009 22:14:39 -0700 Subject: [PATCH] Fix changed handling of service connect watches --- plugins/bluetooth.c | 3 --- plugins/supplicant.c | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) 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; } -- 2.7.4