Use ScanDone signal from connman instead of wpa_supplicant

This allows application to perform scan immediately on receiving
ScanDone signal. Previously there was synchronization issue between
Application and connman receiving ScanDone signal.

Change-Id: I69493c586e9e45296ecbb425f2476dd6f6449abc
Signed-off-by: Saurav Babu <saurav.babu@samsung.com>

diff --git a/src/network-signal-handler.c b/src/network-signal-handler.c
index ed00cb1..9f98fcc 100755 (executable)
--- a/src/network-signal-handler.c
+++ b/src/network-signal-handler.c
@@ -628,9 +628,7 @@ static int __net_handle_scan_done(GVariant *param)
 {
        net_event_info_t event_data = { 0, };
 
-       if (request_table[NETWORK_REQUEST_TYPE_SPECIFIC_SCAN].flag == TRUE)
-               return NET_ERR_NONE;
-       else if (request_table[NETWORK_REQUEST_TYPE_SCAN].flag == TRUE) {
+       if (request_table[NETWORK_REQUEST_TYPE_SCAN].flag == TRUE) {
                memset(&request_table[NETWORK_REQUEST_TYPE_SCAN], 0,
                                sizeof(network_request_table_t));
 
@@ -890,7 +888,7 @@ static int __net_handle_wifi_connect_fail_event(GVariant *param)
        return NET_ERR_NONE;
 }
 
-static void __net_supplicant_signal_filter(GDBusConnection *conn,
+static void __net_connman_manager_signal_filter(GDBusConnection *conn,
                const gchar *name, const gchar *path, const gchar *interface,
                const gchar *sig, GVariant *param, gpointer user_data)
 {
@@ -1005,13 +1003,13 @@ int _net_subscribe_signal_wifi(void)
        /* Create supplicant service connection */
        gdbus_conn_subscribe_id_supplicant = g_dbus_connection_signal_subscribe(
                        connection,
-                       SUPPLICANT_SERVICE,
-                       SUPPLICANT_IFACE_INTERFACE,
+                       CONNMAN_SERVICE,
+                       CONNMAN_MANAGER_INTERFACE,
                        "ScanDone",
-                       NULL,
+                       CONNMAN_MANAGER_PATH,
                        NULL,
                        G_DBUS_SIGNAL_FLAGS_NONE,
-                       __net_supplicant_signal_filter,
+                       __net_connman_manager_signal_filter,
                        NULL,
                        NULL);