disable: send client ID as dbus parameter
authorSeonah Moon <seonah1.moon@samsung.com>
Fri, 14 Feb 2020 11:20:36 +0000 (20:20 +0900)
committerSeonah Moon <seonah1.moon@samsung.com>
Fri, 14 Feb 2020 11:20:36 +0000 (20:20 +0900)
src/include/wifi-aware-gdbus.h
src/wifi-aware-gdbus.c
src/wifi-aware-private.c

index 680b0d0..d6b34ca 100644 (file)
@@ -56,7 +56,7 @@ guint wifi_aware_gdbus_register_signal(wifi_aware_signal_e signal,
 
 int wifi_aware_gdbus_enable(wifi_aware_h wifi_aware,
                wifi_aware_enable_request_s *req, GAsyncReadyCallback cb);
-int wifi_aware_gdbus_disable(wifi_aware_h wifi_aware, GAsyncReadyCallback cb);
+int wifi_aware_gdbus_disable(wifi_aware_h wifi_aware, int client_id, GAsyncReadyCallback cb);
 int wifi_aware_gdbus_publish(wifi_aware_publish_h publish, int client_id, GAsyncReadyCallback cb);
 int wifi_aware_gdbus_cancel_publish(wifi_aware_publish_h publish, int client_id);
 int wifi_aware_gdbus_update_publish(wifi_aware_publish_h publish, int client_id, GAsyncReadyCallback cb);
index 196cf22..ae2ede3 100644 (file)
@@ -332,7 +332,7 @@ int wifi_aware_gdbus_enable(wifi_aware_h wifi_aware,
        return ret;
 }
 
-int wifi_aware_gdbus_disable(wifi_aware_h wifi_aware, GAsyncReadyCallback cb)
+int wifi_aware_gdbus_disable(wifi_aware_h wifi_aware, int client_id, GAsyncReadyCallback cb)
 {
        __WIFI_AWARE_FUNC_ENTER__;
        int ret = WIFI_AWARE_ERROR_NONE;
@@ -340,7 +340,7 @@ int wifi_aware_gdbus_disable(wifi_aware_h wifi_aware, GAsyncReadyCallback cb)
        ret = __wifi_aware_dbus_method_call_async(
                WIFI_AWARE_DISCOVERY_INTERFACE,
                WIFI_AWARE_DISCOVERY_PATH,
-               "Disable", NULL, cb, wifi_aware);
+               "Disable", g_variant_new("(i)", client_id), cb, wifi_aware);
 
        if (ret != WIFI_AWARE_ERROR_NONE) {
                WIFI_AWARE_LOGE("wifi_aware_dbus_method_call_async() failed");
index 0c68a59..714b4eb 100644 (file)
@@ -448,7 +448,10 @@ void _add_disabled_callback(wifi_aware_h wifi_aware,
 
 int _wifi_aware_disable_request(wifi_aware_h wifi_aware)
 {
-       return wifi_aware_gdbus_disable(wifi_aware, __disable_request_reply);
+       wifi_aware_s *aware = (wifi_aware_s *)wifi_aware;
+       return wifi_aware_gdbus_disable(wifi_aware,
+                       aware->client_id,
+                       __disable_request_reply);
 }
 
 int _wifi_aware_publish_handle_create(wifi_aware_h wifi_aware, wifi_aware_publish_h *publish)