From 440fae424077c23dcfdf205ed917d8aa56e16586 Mon Sep 17 00:00:00 2001 From: saerome kim Date: Fri, 10 Feb 2017 14:33:43 +0900 Subject: [PATCH] Change signal / method name - nwk_disc_req -> mgnt_nwk_disc_req - nwk_disc_rsp -> mgmt_nwk_disc_rsp - nwk_update_req -> mgmt_nwk_update_req Change-Id: I4fd5fbb80a2ba697b16074abef2f768240f3d87d Signed-off-by: saerome kim --- lib/zbl-dbus.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/zbl-dbus.c b/lib/zbl-dbus.c index 97677b3..90840af 100644 --- a/lib/zbl-dbus.c +++ b/lib/zbl-dbus.c @@ -4397,7 +4397,7 @@ int zbl_mgmt_nwk_disc_req(nwk_addr addr16, unsigned int scan_channels, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "nwk_disc_rsp", + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "mgmt_nwk_disc_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); @@ -4413,12 +4413,12 @@ int zbl_mgmt_nwk_disc_req(nwk_addr addr16, unsigned int scan_channels, container->tid = g_timeout_add_seconds(to, _zbl_timeout_cb, container); container->userdata = user_data; - variant = g_dbus_proxy_call_sync(zdo_dev_proxy, "nwk_disc_req", + variant = g_dbus_proxy_call_sync(zdo_dev_proxy, "mgmt_nwk_disc_req", g_variant_new("(quyqy)", addr16, scan_channels, scan_duration, scan_count, start_idx), G_DBUS_CALL_FLAGS_NONE, to, NULL, &dbus_err); if (!variant) { - ERR("Failed to get 'nwk_disc_req' [%s]", dbus_err->message); + ERR("Failed to get 'mgmt_nwk_disc_req' [%s]", dbus_err->message); g_error_free(dbus_err); return ZIGBEE_ERROR_IO_ERROR; } @@ -4442,12 +4442,12 @@ int zbl_mgmt_nwk_update_req(unsigned int scan_channels, unsigned char scan_durat DBG("zbl_mgmt_nwk_update_req()"); - variant = g_dbus_proxy_call_sync(zdo_dev_proxy, "nwk_update_req", + variant = g_dbus_proxy_call_sync(zdo_dev_proxy, "mgmt_nwk_update_req", g_variant_new("(quyyy)", nwk_manager_addr, scan_channels, scan_duration, scan_count, nwk_update_id), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &dbus_err); if (!variant) { - ERR("Failed to get 'nwk_update_req' [%s]", dbus_err->message); + ERR("Failed to get 'mgmt_nwk_update_req' [%s]", dbus_err->message); g_error_free(dbus_err); return ZIGBEE_ERROR_IO_ERROR; } -- 2.7.4