CAPI/Device: Remove property Icon for device

Change-Id: I80bf3792afbbeb395ded8b74339145e73bbed5f5
Signed-off-by: Wu Jiangbo <jiangbox.wu@intel.com>

diff --git a/capi/bluetooth.c b/capi/bluetooth.c
index e8fbee3..ab154a2 100644 (file)
--- a/capi/bluetooth.c
+++ b/capi/bluetooth.c
@@ -162,7 +162,7 @@ static bt_adapter_device_discovery_info_s *get_discovery_device_info(
        guint len;
        signed short rssi;
        int paired;
-       char *alias, *address, *icon;
+       char *alias, *address;
        char **uuids;
        unsigned int class;
        bt_adapter_device_discovery_info_s *device_info;
@@ -179,7 +179,6 @@ static bt_adapter_device_discovery_info_s *get_discovery_device_info(
        address = bluez_device_get_property_address(device);
        alias = bluez_device_get_property_alias(device);
        uuids = bluez_device_get_property_uuids(device);
-       icon = bluez_device_get_property_icon(device);
        bluez_device_get_property_class(device, &class);
        bluez_device_get_property_rssi(device, &rssi);
        bluez_device_get_property_paired(device, &paired);
@@ -189,7 +188,6 @@ static bt_adapter_device_discovery_info_s *get_discovery_device_info(
        device_info->service_count = len;
        device_info->remote_address = address;
        device_info->remote_name = alias;
-       device_info->icon = icon;
        device_info->rssi = rssi;
        device_info->is_bonded = paired;
        device_info->service_uuid = uuids;
@@ -209,7 +207,6 @@ static void free_discovery_device_info(
 
        g_free(discovery_device_info->remote_address);
        g_free(discovery_device_info->remote_name);
-       g_free(discovery_device_info->icon);
 
        for (i = 0; i < discovery_device_info->service_count; ++i)
                g_free(discovery_device_info->service_uuid[i]);
@@ -222,7 +219,7 @@ static bt_device_info_s *get_device_info(bluez_device_t *device)
 {
        guint len;
        int paired, connected, trusted;
-       char *alias, *address, *icon;
+       char *alias, *address;
        char **uuids;
        unsigned int class;
        bt_device_info_s *device_info;
@@ -241,7 +238,6 @@ static bt_device_info_s *get_device_info(bluez_device_t *device)
        address = bluez_device_get_property_address(device);
        alias = bluez_device_get_property_alias(device);
        uuids = bluez_device_get_property_uuids(device);
-       icon = bluez_device_get_property_icon(device);
        bluez_device_get_property_class(device, &class);
        bluez_device_get_property_paired(device, &paired);
        bluez_device_get_property_connected(device, &connected);
@@ -252,7 +248,6 @@ static bt_device_info_s *get_device_info(bluez_device_t *device)
        device_info->service_count = len;
        device_info->remote_address = address;
        device_info->remote_name = alias;
-       device_info->icon = icon;
        device_info->is_bonded = paired;
        device_info->is_connected = connected;
        device_info->is_authorized = trusted;
@@ -561,7 +556,8 @@ static void bluez_device_created(bluez_device_t *device, void *user_data)
                                                discovery_device_info->service_uuid,
                                                discovery_device_info->service_count);
 
-       node->cb(BT_SUCCESS, BT_ADAPTER_DEVICE_DISCOVERY_FOUND,
+       if (node && node->cb)
+               node->cb(BT_SUCCESS, BT_ADAPTER_DEVICE_DISCOVERY_FOUND,
                                discovery_device_info, node->user_data);
 
        set_device_property_changed_callback(device);
@@ -621,6 +617,7 @@ static void _bt_update_bluetooth_callbacks(void)
                bluez_adapter_set_device_created_cb(default_adapter,
                                        bluez_device_created,
                                        device_created_node);
+
        if (adapter_discovering_node)
                bluez_adapter_set_device_discovering_cb(default_adapter,
                                        bluez_adapter_discovering_changed,
@@ -696,6 +693,7 @@ static void destroy_bluez_lib(void)
 
 void _bt_service_bt_in_service_watch(uint in_service, void *user_data)
 {
+       DBG("");
        if (in_service)
                setup_bluez_lib();
 }
@@ -3309,3 +3307,35 @@ int bt_spp_unset_data_received_cb(void)
 
        return BT_SUCCESS;
 }
+
+int bt_adapter_set_visibility_mode_changed_cb(
+                       bt_adapter_visibility_mode_changed_cb callback,
+                       void *user_data)
+{
+       DBG("Not implement");
+
+       return BT_SUCCESS;
+}
+
+int bt_socket_set_connection_state_changed_cb(
+                       bt_socket_connection_state_changed_cb callback,
+                       void *user_data)
+{
+       DBG("Not implement");
+
+       return BT_SUCCESS;
+}
+
+int bt_socket_unset_data_received_cb(void)
+{
+       DBG("Not implement");
+
+       return BT_SUCCESS;
+}
+
+int bt_socket_unset_connection_state_changed_cb(void)
+{
+       DBG("Not implement");
+
+       return BT_SUCCESS;
+}

diff --git a/include/bluetooth.h b/include/bluetooth.h
index 2c1fc19..9d38f88 100644 (file)
--- a/include/bluetooth.h
+++ b/include/bluetooth.h
@@ -474,7 +474,6 @@ typedef struct
        char *remote_address;   /**< The address of remote device */
        char *remote_name;      /**< The name of remote device */
        bt_class_s bt_class;    /**< The Bluetooth classes */
-       char *icon;     /**< The Bluetooth icon */
        int rssi;       /**< The strength indicator of received signal  */
        bool is_bonded; /**< The bonding state */
        char **service_uuid;  /**< The UUID list of service */
@@ -493,7 +492,6 @@ typedef struct
        char *remote_address;   /**< The address of remote device */
        char *remote_name;      /**< The name of remote device */
        bt_class_s bt_class;    /**< The Bluetooth classes */
-       char *icon;     /**< The Bluetooth icon */
        char **service_uuid;  /**< The UUID list of service */
        int service_count;      /**< The number of services */
        bool is_bonded; /**< The bonding state */

diff --git a/test/bluez-capi-test.c b/test/bluez-capi-test.c
index 67f758b..21410a7 100644 (file)
--- a/test/bluez-capi-test.c
+++ b/test/bluez-capi-test.c
@@ -243,7 +243,6 @@ static void device_discovery_cb(int result,
                DBG("Device %s has found, follow is info:",
                                        discovery_info->remote_name);
                DBG("\tAddress: %s", discovery_info->remote_address);
-               DBG("\tIcon: %s", discovery_info->icon);
                DBG("\tRSSI: %d", discovery_info->rssi);
                DBG("\tIs bonded: %d", discovery_info->is_bonded);
                DBG("\tservice_count: %d", discovery_info->service_count);
@@ -269,7 +268,6 @@ static void device_discovery_cb(int result,
                                g_strdup(discovery_info->remote_name);
                device_info->remote_address =
                                g_strdup(discovery_info->remote_address);
-               device_info->icon = g_strdup(discovery_info->icon);
                device_info->rssi = discovery_info->rssi;
                device_info->is_bonded = discovery_info->is_bonded;
                device_info->service_count = discovery_info->service_count;
@@ -293,7 +291,6 @@ static void device_discovery_cb(int result,
                                device_list = g_list_remove(device_list, info);
                                g_free(info->remote_name);
                                g_free(info->remote_address);
-                               g_free(info->icon);
                                g_strfreev(info->service_uuid);
                                g_free(info);
                        }
@@ -371,7 +368,6 @@ static int unset_discovery_callback(const char *p1, const char *p2)
 
                g_free(device_info->remote_name);
                g_free(device_info->remote_address);
-               g_free(device_info->icon);
 
                g_strfreev(device_info->service_uuid);
                g_free(device_info);
@@ -491,7 +487,6 @@ static void print_bonded_device_info(bt_device_info_s *device_info)
 
        printf("\n\tName: %s", device_info->remote_name);
        printf("\n\t\tAddress: %s", device_info->remote_address);
-       printf("\n\t\tIcon: %s", device_info->icon);
        printf("\n\t\tConnected: %d", device_info->is_connected);
        printf("\n\t\tBonded: %d", device_info->is_bonded);
        printf("\n\t\tAuthorized: %d", device_info->is_authorized);
@@ -812,9 +807,8 @@ static int get_bonded_device_info(const char *p1, const char *p2)
                return 0;
        }
 
-       DBG("Address %s Name %s Icon %s", device_info->remote_address,
-                                               device_info->remote_name,
-                                               device_info->icon);
+       DBG("Address %s Name %s", device_info->remote_address,
+                                               device_info->remote_name);
 
        bt_adapter_free_device_info(device_info);
 
@@ -1029,7 +1023,6 @@ static int list_devices(const char *p1, const char *p2)
 
                printf("\n\tName: %s", discovery_info->remote_name);
                printf("\n\t\tAddress: %s", discovery_info->remote_address);
-               printf("\n\t\tIcon: %s", discovery_info->icon);
                printf("\n\t\tRSSI: %d", discovery_info->rssi);
                printf("\n\t\tBonded: %d", discovery_info->is_bonded);
                printf("\n\t\tservice_count: %d", discovery_info->service_count);

diff --git a/test/bluez-lib-test.c b/test/bluez-lib-test.c
index 2e612f0..d195313 100644 (file)
--- a/test/bluez-lib-test.c
+++ b/test/bluez-lib-test.c
@@ -811,7 +811,7 @@ static int connect_spp(void *parameter)
 
        return 0;
 }
-
+/*
 static int icon(void *parameter)
 {
        gchar *icon;
@@ -838,7 +838,7 @@ static int icon(void *parameter)
 
        return 0;
 }
-
+*/
 struct {
        const char *command;
        int (*function)(void *parameter);
@@ -880,8 +880,8 @@ struct {
        {"remove", remove_device,
                "Usage: remove F0_DC_E2_7F_41_3D\n\tRemove device"},
 
-       {"icon", icon,
-               "Usage: icon F0_DC_E2_7F_41_3D\n\tGet device Icon"},
+//     {"icon", icon,
+//             "Usage: icon F0_DC_E2_7F_41_3D\n\tGet device Icon"},
 
        {"l_a_uuid", list_uuid,
                "Usage: list_uuid\n\tList adapter UUIDs"},