From 13cddc2dfc56cd5fb51d066e327666c5a61a7c56 Mon Sep 17 00:00:00 2001 From: Injun Yang Date: Fri, 23 Dec 2016 11:12:10 +0900 Subject: [PATCH] Code cleanup [Model] All [BinType] AP [Customer] OPEN [Issue#] N/A [Request] Internal [Occurence Version] N/A [Problem] N/A [Cause & Measure] Remove unused code [Checking Method] N/A [Team] Basic Connection [Developer] Injun Yang [Solution company] Samsung [Change Type] Specification change Change-Id: I7d1afbe298e091451e69f4c7528af460c21a3011 Signed-off-by: Injun Yang --- gdbus/gdbus.h | 2 +- gdbus/object.c | 2 +- src/gatt-client.c | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 54ab0f4..b58c486 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -277,7 +277,7 @@ gboolean g_dbus_emit_signal_valist(DBusConnection *connection, const char *path, const char *interface, const char *name, int type, va_list args); -#ifdef GATT_NO_RELAY +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean g_dbus_emit_signal_to_dest(DBusConnection *connection, const char *dest, const char *path, const char *interface, const char *name, int type, ...); diff --git a/gdbus/object.c b/gdbus/object.c index ba5e4fd..cbda9a6 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -1674,7 +1674,7 @@ gboolean g_dbus_emit_signal(DBusConnection *connection, return result; } -#ifdef GATT_NO_RELAY +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean g_dbus_emit_signal_valist_to_dest(DBusConnection *connection, const char *dest, const char *path, const char *interface, const char *name, int type, va_list args) diff --git a/src/gatt-client.c b/src/gatt-client.c index bb3b8b7..87e363c 100644 --- a/src/gatt-client.c +++ b/src/gatt-client.c @@ -1247,7 +1247,6 @@ void gatt_characteristic_value_changed(struct notify_client *client, const uint8 char *chrc_path = strdup(chrc->path); dbus_int32_t result = 0; -#ifdef GATT_NO_RELAY g_dbus_emit_signal_to_dest(btd_get_dbus_connection(), client->owner, chrc_path, GATT_CHARACTERISTIC_IFACE, "GattValueChanged", @@ -1255,14 +1254,6 @@ void gatt_characteristic_value_changed(struct notify_client *client, const uint8 DBUS_TYPE_STRING, &chrc_path, DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &data, data_len, DBUS_TYPE_INVALID); -#else - g_dbus_emit_signal(btd_get_dbus_connection(), chrc->path, - GATT_CHARACTERISTIC_IFACE, "GattValueChanged", - DBUS_TYPE_INT32, &result, - DBUS_TYPE_STRING, &chrc_path, - DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &data, data_len, - DBUS_TYPE_INVALID); -#endif if (chrc_path) free(chrc_path); -- 2.7.4