From a762e28a8763ee17612d232c6408b522987d17f3 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Fri, 14 Feb 2020 20:20:36 +0900 Subject: [PATCH] disable: send client ID as dbus parameter --- src/include/wifi-aware-gdbus.h | 2 +- src/wifi-aware-gdbus.c | 4 ++-- src/wifi-aware-private.c | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/include/wifi-aware-gdbus.h b/src/include/wifi-aware-gdbus.h index 680b0d0..d6b34ca 100644 --- a/src/include/wifi-aware-gdbus.h +++ b/src/include/wifi-aware-gdbus.h @@ -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); diff --git a/src/wifi-aware-gdbus.c b/src/wifi-aware-gdbus.c index 196cf22..ae2ede3 100644 --- a/src/wifi-aware-gdbus.c +++ b/src/wifi-aware-gdbus.c @@ -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"); diff --git a/src/wifi-aware-private.c b/src/wifi-aware-private.c index 0c68a59..714b4eb 100644 --- a/src/wifi-aware-private.c +++ b/src/wifi-aware-private.c @@ -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) -- 2.7.4