Fix build warnings 15/62815/1 accepted/tizen/common/20160322.150042 accepted/tizen/ivi/20160322.084659 accepted/tizen/mobile/20160322.084604 accepted/tizen/tv/20160322.084620 accepted/tizen/wearable/20160322.084639 submit/tizen/20160322.013343
authorparas.kumar <paras.kumar@samsung.com>
Fri, 18 Mar 2016 11:33:55 +0000 (17:03 +0530)
committerparas.kumar <paras.kumar@samsung.com>
Fri, 18 Mar 2016 11:33:55 +0000 (17:03 +0530)
Change-Id: I7abc884a980710d25d8b626e81fb435972a2d109
Signed-off-by: paras.kumar <paras.kumar@samsung.com>
src/libraries/bt-callback.c
src/libraries/bt-ipc-handler.c
src/libraries/bt-net-connection.c
src/libraries/bt-util.c
src/ui/bt-main-ug.c
src/ui/bt-main-view.c
src/ui/bt-profile-view.c
src/ui/bt-widget.c

index 4fcb2ff..4adf0c9 100644 (file)
@@ -36,6 +36,7 @@
 #include "bt-ipc-handler.h"
 #include "bt-resource.h"
 #include "bt-net-connection.h"
+#include "syspopup_caller.h"
 
 /**********************************************************************
 *                                                 Static Functions
@@ -1047,7 +1048,7 @@ void _bt_cb_audio_state_changed(int result, bool connected,
                        BT_ERR("Popup launch failed...retry %d", ret);
                bundle_free(b);
                if (connected && result == BT_ERROR_NONE) {
-                       _bt_ug_destroy(ugd, result);
+                       _bt_ug_destroy(ugd, (void *)&result);
                        return;
                }
        }
index cf46c48..f30b743 100644 (file)
@@ -66,8 +66,6 @@ int _bt_ipc_register_popup_event_signal(bt_ug_data *ugd)
 
        retvm_if(ugd == NULL, BT_UG_FAIL, "Invalid argument: data is NULL");
 
-       g_type_init();
-
        ugd->gdbus_owner_id = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                BT_UG_IPC_INTERFACE,
                                G_BUS_NAME_OWNER_FLAGS_NONE,
index aaf4826..decf704 100644 (file)
@@ -157,7 +157,7 @@ static void *__bt_get_net_profile_list(void *connection,
                        continue;
                }
 
-               split_string = g_strsplit(profile_name, "_", 3);
+               split_string = (gchar **)g_strsplit(profile_name, "_", 3);
 
                g_free(profile_name);
 
@@ -171,7 +171,7 @@ static void *__bt_get_net_profile_list(void *connection,
                        continue;
 
                profile_data->profile_h = profile_h;
-               profile_data->address = g_strdup(split_string[2]);
+               profile_data->address = (unsigned char *)g_strdup(split_string[2]);
                ret_list = eina_list_append(ret_list, profile_data);
                g_strfreev(split_string);
        }
@@ -397,7 +397,7 @@ int _bt_connect_net_profile(void *connection, void *profile, void *user_data)
                        BT_ERR("notification_status_message_post() ERROR [%d]", result);
 
                /* Set PAN Connection as Disconnected to Update the Checkbox*/
-               _bt_util_addr_string_to_addr_type(address.bd_addr, &dev->addr_str);
+               _bt_util_addr_string_to_addr_type(address.bd_addr, (const char *)&dev->addr_str);
                BT_DBG("Updating Checkbox as not connected");
                dev->network_checked = dev->connected_mask & BT_NETWORK_CONNECTED;
                bt_ug_data * ugd = dev->ugd;
index 1d61942..200ebd1 100644 (file)
@@ -570,7 +570,7 @@ void _bt_util_max_len_reached_cb(void *data, Evas_Object *obj,
 {
        FN_START;
        char str[BT_STR_ACCES_INFO_MAX_LEN] = {0, };
-       snprintf(str, sizeof(str), BT_STR_MAX_CHARACTER_REACHED,
+       snprintf(str, sizeof(str), "%s %d", BT_STR_MAX_CHARACTER_REACHED,
                 DEVICE_NAME_MAX_CHARACTER);
 
        int ret = notification_status_message_post(str);
index ef2a9ac..7bd7b23 100644 (file)
@@ -48,6 +48,7 @@
 #include "bt-callback.h"
 #include "bt-string-define.h"
 #include "bt-net-connection.h"
+#include "bluetooth_internal.h"
 
 #define TOGGLE_OFF     "0"
 #define TOGGLE_ON      "1"
@@ -281,6 +282,7 @@ static int __bt_initialize_view(bt_ug_data *ugd)
        return 0;
 }
 
+#ifdef TIZEN_BT_A2DP_SINK_ENABLE
 static void __bt_free_device_info(bt_dev_t *dev)
 {
        ret_if(!dev);
@@ -428,7 +430,6 @@ static void __bt_create_autoconnect_popup(bt_dev_t *dev)
        FN_END;
 }
 
-#ifdef TIZEN_BT_A2DP_SINK_ENABLE
 static void __bt_auto_connect(bt_ug_data *ugd)
 {
        FN_START;
index c97e67d..4d683e5 100644 (file)
@@ -45,6 +45,8 @@
 #include "bt-widget.h"
 #include "bt-resource.h"
 #include "bt-net-connection.h"
+#include "bluetooth_internal.h"
+#include "syspopup_caller.h"
 
 #define MULTI_SHARE_SERVICE_DATA_PATH "http://tizen.org/appcontrol/data/path"
 #define APP_CONTROL_OPERATION_SHARE_CONTACT "http://tizen.org/appcontrol/operation/share_contact"
@@ -440,37 +442,6 @@ int _bt_idle_destroy_ug(void *data)
        return BT_UG_ERROR_NONE;
 }
 
-static bool __bt_main_create_vcard_cb(const char *file_name,
-                                       int progress_count,
-                                       void *user_data)
-{
-       BT_INFO("progress [%d]", progress_count);
-
-       if (file_name && *(char **)user_data == NULL)
-               BT_INFO("file_name [%s]", file_name);
-               *(char **)user_data =
-                   g_strdup_printf("%s/%s", SHARE_CONTACT_DATA_PATH,
-                                   file_name);
-
-       return true;
-}
-
-static bool __bt_main_create_vcard_idv_cb(const char *file_name,
-                                       int progress_count,
-                                       void *user_data)
-{
-       BT_INFO("progress [%d]", progress_count);
-       char **file_array = *(char ***)user_data;
-       if (file_array && file_name) {
-               BT_INFO("file_name [%s]", file_name);
-               file_array[progress_count-1] =
-                           g_strdup_printf("%s/%s", SHARE_CONTACT_DATA_PATH,
-                                           file_name);
-       }
-
-       return true;
-}
-
 static gboolean __bt_main_visible_timeout_cb(gpointer user_data)
 {
        FN_START;
@@ -693,7 +664,9 @@ static char *__bt_main_paired_device_label_get(void *data, Evas_Object *obj,
        FN_START;
 
        char *buf = NULL;
+#ifdef KIRAN_ACCESSIBILITY
        char str[BT_STR_ACCES_INFO_MAX_LEN] = { 0, };
+#endif
        bt_dev_t *dev = NULL;
        bt_ug_data *ugd = NULL;
        int r = 0, g = 0, b = 0, a = 0;
@@ -1620,31 +1593,6 @@ static app_control_h __bt_main_get_pick_result(bt_ug_data *ugd, gboolean result)
        return service;
 }
 
-static app_control_h __bt_main_get_connection_result(bt_ug_data *ugd,
-                                                       gboolean result)
-{
-       app_control_h service = NULL;
-       const char *result_str;
-       bt_adapter_state_e bt_state = BT_ADAPTER_DISABLED;
-
-       retv_if(ugd == NULL, NULL);
-
-       app_control_create(&service);
-
-       retv_if(service == NULL, NULL);
-
-       if (result == TRUE)
-               result_str = BT_RESULT_SUCCESS;
-       else
-               result_str = BT_RESULT_FAIL;
-
-       if (app_control_add_extra_data(service, "result", result_str) < 0) {
-               BT_ERR("Fail to add extra data");
-       }
-
-       return service;
-}
-
 static Eina_Bool __bt_main_quit_btn_cb(void *data, Elm_Object_Item *it)
 {
        FN_START;
index 08de533..a992bb7 100644 (file)
@@ -38,6 +38,7 @@
 #include "bt-ipc-handler.h"
 #include "bt-util.h"
 #include "bt-net-connection.h"
+#include "bluetooth_internal.h"
 
 /**********************************************************************
 *                                      Static Functions declaration
@@ -364,7 +365,6 @@ static void __bt_profile_name_item_sel(void *data, Evas_Object *obj,
 {
        FN_START;
 
-       Elm_Entry_Filter_Limit_Size limit_filter;
        bt_profile_view_data *vd;
 
        if (event_info)
@@ -379,14 +379,14 @@ static void __bt_profile_name_item_sel(void *data, Evas_Object *obj,
        bt_dev_t *dev = elm_object_item_data_get((Elm_Object_Item *)event_info);
        ret_if(dev == NULL);
        Evas_Object *popup = NULL;
-       Evas_Object *layout = NULL;
-       Evas_Object *entry = NULL;
        Evas_Object *button = NULL;
-       char *name_value = NULL;
        Evas_Object *genlist = NULL;
 
-       name_value = elm_entry_utf8_to_markup(dev->name);
+/*
+       char *name_value = NULL;
 
+       name_value = elm_entry_utf8_to_markup(dev->name);
+*/
        popup = elm_popup_add(ugd->base);
        eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
index 30f551e..42b2c32 100644 (file)
@@ -155,23 +155,23 @@ void _bt_set_popup_text(void *data, Evas_Object *popup)
        switch(ugd->popup_data.type) {
                case BT_POPUP_PAIRING_ERROR :
                        if (ugd->popup_data.data) {
-                               temp = g_strdup_printf(
+                               temp = g_strdup_printf("%s %s",
                                        BT_STR_UNABLE_TO_PAIR_WITH_PS,
-                                       ugd->popup_data.data);
+                                       (char *)ugd->popup_data.data);
                        }
                        break;
                case BT_POPUP_CONNECTION_ERROR :
                        if (ugd->popup_data.data) {
-                               temp = g_strdup_printf(
+                               temp = g_strdup_printf("%s %s",
                                        BT_STR_UNABLE_TO_CONNECT_TO_PS,
-                                       ugd->popup_data.data);
+                                       (char *)ugd->popup_data.data);
                        }
                        break;
                case BT_POPUP_DISCONNECT :
                        if (ugd->popup_data.data) {
-                               temp = g_strdup_printf(
+                               temp = g_strdup_printf("%s %s",
                                        BT_STR_END_CONNECTION,
-                                       ugd->popup_data.data);
+                                       (char *)ugd->popup_data.data);
                        }
                        break;
                case BT_POPUP_GET_SERVICE_LIST_ERROR :