From c07b511d25638fdce6ea66ec9d76e2e5e6f8a75c Mon Sep 17 00:00:00 2001 From: Taejin Woo Date: Wed, 8 Jun 2016 16:13:19 +0900 Subject: [PATCH] Fix the function and variable name for IPSP Change-Id: I0cc6771f2ae83b6381374cdbe00afd43e2932d18 Signed-off-by: Taejin Woo --- bt-api/bt-event-handler.c | 6 +++--- bt-service/bt-service-event-receiver.c | 2 +- bt-service/bt-service-event-sender.c | 4 ++-- include/bluetooth-api.h | 2 +- include/bt-internal-types.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c index 96a5e2d..f571cb9 100644 --- a/bt-api/bt-event-handler.c +++ b/bt-api/bt-event-handler.c @@ -998,19 +998,19 @@ void __bt_device_event_filter(GDBusConnection *connection, _bt_common_event_cb(BLUETOOTH_EVENT_IPSP_DISCONNECTED, result, &dev_address, event_info->cb, event_info->user_data); - } else if (strcasecmp(signal_name, BT_IPSP_BT_INTERFACE_INFO) == 0) { + } else if (strcasecmp(signal_name, BT_IPSP_INTERFACE_INFO) == 0) { const char *address = NULL; const char *if_name = NULL; bt_ipsp_interface_info_t ipsp_iface_info; memset(&ipsp_iface_info, 0, sizeof(ipsp_iface_info)); - BT_DBG("BT_IPSP_BT_INTERFACE_INFO"); + BT_DBG("BT_IPSP_INTERFACE_INFO"); g_variant_get(parameters, "(i&s&s)", &result, &address, &if_name); _bt_convert_addr_string_to_type(ipsp_iface_info.btaddr.addr, address); memcpy(ipsp_iface_info.if_name, if_name, 16); - _bt_common_event_cb(BLUETOOTH_EVENT_IPSP_BT_INTERFACE_INFO, + _bt_common_event_cb(BLUETOOTH_EVENT_IPSP_INTERFACE_INFO, result, &ipsp_iface_info, event_info->cb, event_info->user_data); } else if (strcasecmp(signal_name, BT_LE_DATA_LENGTH_CHANGED) == 0) { diff --git a/bt-service/bt-service-event-receiver.c b/bt-service/bt-service-event-receiver.c index 9a22166..2bd9f50 100644 --- a/bt-service/bt-service-event-receiver.c +++ b/bt-service/bt-service-event-receiver.c @@ -1131,7 +1131,7 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path) /* Send event to application */ _bt_send_event(BT_DEVICE_EVENT, - BLUETOOTH_EVENT_IPSP_BT_INTERFACE_INFO, + BLUETOOTH_EVENT_IPSP_INTERFACE_INFO, param); g_free(address); } diff --git a/bt-service/bt-service-event-sender.c b/bt-service/bt-service-event-sender.c index f539589..f3977e0 100644 --- a/bt-service/bt-service-event-sender.c +++ b/bt-service/bt-service-event-sender.c @@ -395,8 +395,8 @@ int _bt_send_event(int event_type, int event, GVariant *param) case BLUETOOTH_EVENT_IPSP_DISCONNECTED: signal = BT_IPSP_DISCONNECTED; break; - case BLUETOOTH_EVENT_IPSP_BT_INTERFACE_INFO: - signal = BT_IPSP_BT_INTERFACE_INFO; + case BLUETOOTH_EVENT_IPSP_INTERFACE_INFO: + signal = BT_IPSP_INTERFACE_INFO; break; case BLUETOOTH_EVENT_GATT_CHAR_VAL_CHANGED: signal = BT_GATT_CHAR_VAL_CHANGED; diff --git a/include/bluetooth-api.h b/include/bluetooth-api.h index c7aa3c7..4af98b4 100644 --- a/include/bluetooth-api.h +++ b/include/bluetooth-api.h @@ -633,7 +633,7 @@ typedef enum { BLUETOOTH_EVENT_IPSP_INIT_STATE_CHANGED = BLUETOOTH_EVENT_IPSP_BASE, /**