Merge "Fix minor issues on adapter name property" into tizen

diff --git a/bt-service/bt-service-adapter.c b/bt-service/bt-service-adapter.c
index f10287b..34112bb 100644 (file)
--- a/bt-service/bt-service-adapter.c
+++ b/bt-service/bt-service-adapter.c
@@ -979,7 +979,6 @@ int _bt_get_local_address(bluetooth_device_address_t *local_address)
 int _bt_get_local_name(bluetooth_device_name_t *local_name)
 {
        DBusGProxy *proxy;
-       GHashTable *hash = NULL;
        GError *err = NULL;
        GValue name_v = { 0 };
        char *name = NULL;
@@ -1017,7 +1016,6 @@ int _bt_get_local_name(bluetooth_device_name_t *local_name)
                ret = BLUETOOTH_ERROR_INTERNAL;
        }
 
-       g_hash_table_destroy(hash);
        return ret;
 }
 

diff --git a/bt-service/bt-service-event-receiver.c b/bt-service/bt-service-event-receiver.c
index 8c60c1e..e79606a 100644 (file)
--- a/bt-service/bt-service-event-receiver.c
+++ b/bt-service/bt-service-event-receiver.c
@@ -760,7 +760,7 @@ void __bt_adapter_property_changed_event(DBusMessageIter *msg_iter, const char *
                        }
                        __bt_discovery_finished();
                }
-       } else if (strcasecmp(property, "Name") == 0) {
+       } else if (strcasecmp(property, "Alias") == 0) {
                char *name = NULL;
 
                dbus_message_iter_recurse(&dict_iter, &value_iter);