From 6b91ff217807ee9bfdf69a30937dec3940d108fc Mon Sep 17 00:00:00 2001 From: sinikang Date: Tue, 23 Oct 2018 09:06:00 +0900 Subject: [PATCH] Fix build warning Change-Id: Ic60bf00ba7c9f4f8ab36c40c3597ba1f7f8d4999 --- packaging/org.tizen.ciss.spec | 2 +- src/ciss-main.c | 1 - src/ciss-tapi-request.c | 1 - src/ciss-ussd.c | 4 ++-- src/ciss-util.c | 2 +- src/ciss-widget.c | 11 +++++------ 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packaging/org.tizen.ciss.spec b/packaging/org.tizen.ciss.spec index 7b9a70d..ef83185 100644 --- a/packaging/org.tizen.ciss.spec +++ b/packaging/org.tizen.ciss.spec @@ -1,6 +1,6 @@ %define major 0 %define minor 1 -%define patchlevel 1 +%define patchlevel 2 Name: org.tizen.ciss Summary: CISS-MMI application diff --git a/src/ciss-main.c b/src/ciss-main.c index de7b322..c03935f 100644 --- a/src/ciss-main.c +++ b/src/ciss-main.c @@ -306,7 +306,6 @@ static int __ciss_relaunch_handler(void *data) char *sim_index = NULL; char *no_display_popup_val = NULL; char *is_sat_request_val = NULL; - int no_display_popup = 0; Eina_Bool is_no_sim = EINA_FALSE; err = app_control_get_extra_data(ad->app_control_handle, "CISS_LAUNCHING_MODE", &launching_mode); diff --git a/src/ciss-tapi-request.c b/src/ciss-tapi-request.c index 21045fd..44f6502 100644 --- a/src/ciss-tapi-request.c +++ b/src/ciss-tapi-request.c @@ -858,7 +858,6 @@ void _ciss_tapi_ussd_resp_handle(int result, void *tapi_data, void *data) DBG("Enter"); ret_if(data == NULL); - int ret = -1; ciss_appdata_t *ad = (ciss_appdata_t *)data; ad->result = result; diff --git a/src/ciss-ussd.c b/src/ciss-ussd.c index 9064a78..240211c 100644 --- a/src/ciss-ussd.c +++ b/src/ciss-ussd.c @@ -140,14 +140,14 @@ Evas_Object *_ciss_create_ussd_view(Evas_Object *parent, void *tapi_data, void * memcpy(&ussd_noti_info, tapi_data, sizeof(TelSsUssdNoti_t)); ussd_record.ind_type = ussd_noti_info.Status; ussd_record.ussd_string_length = ussd_noti_info.Length; - g_strlcpy(&ussd_record.ussd_string, &ussd_noti_info.szString, CISS_USSD_DATA_SIZE_MAX); + g_strlcpy(&ussd_record.ussd_string[0], &ussd_noti_info.szString[0], CISS_USSD_DATA_SIZE_MAX); } else { TelSsUssdResp_t ussd_resp_info; memset(&ussd_resp_info, 0, sizeof(TelSsUssdResp_t)); memcpy(&ussd_resp_info, tapi_data, sizeof(TelSsUssdResp_t)); ussd_record.ind_type = ussd_resp_info.Status; ussd_record.ussd_string_length = ussd_resp_info.Length; - g_strlcpy(&ussd_record.ussd_string, &ussd_resp_info.szString, CISS_USSD_DATA_SIZE_MAX); + g_strlcpy(&ussd_record.ussd_string[0], &ussd_resp_info.szString[0], CISS_USSD_DATA_SIZE_MAX); } #if 0 /* not used API because string treate method changed */ diff --git a/src/ciss-util.c b/src/ciss-util.c index 77b08d6..bc85478 100644 --- a/src/ciss-util.c +++ b/src/ciss-util.c @@ -301,8 +301,8 @@ unsigned int _ciss_util_get_mcc(void) bool _ciss_util_is_gcf_mode(void) { bool ret = false; - int gcf = 0; #ifdef PLATFORM_NOT_SUPPORTED + int gcf = 0; ret = vconf_get_int(VCONFKEY_ADMIN_GCF_TEST, &gcf); if (ret != VCONF_OK) { ERR("vconf_get_int(VCONFKEY_ADMIN_GCF_TEST) failed: ret(%d)", ret); diff --git a/src/ciss-widget.c b/src/ciss-widget.c index 6efdde6..1e23950 100644 --- a/src/ciss-widget.c +++ b/src/ciss-widget.c @@ -331,7 +331,7 @@ Evas_Object *_ciss_create_2_btn_popup(Evas_Object *parent, const char *strmsg, E evas_object_smart_callback_add(left_btn, "clicked", func1, ad); right_btn = elm_button_add(popup); - elm_object_style_set right_btn, "popup"); + elm_object_style_set(right_btn, "popup"); elm_object_domain_translatable_text_set(right_btn, "ciss", "IDS_CALL_BODY_OK"); elm_object_part_content_set(popup, "button2", right_btn); evas_object_smart_callback_add(right_btn, "clicked", func2, ad); @@ -551,7 +551,7 @@ Evas_Object *_ciss_create_win(const char *name) DBG("Enter"); Evas_Object *eo = NULL; int w, h; - const char *str = "mobile"; + //const char *str = "mobile"; // Do not set profile directly in application eo = elm_win_add(NULL, name, ELM_WIN_BASIC); retv_if(eo == NULL, NULL); @@ -562,7 +562,8 @@ Evas_Object *_ciss_create_win(const char *name) elm_win_title_set(eo, name); elm_win_raise(eo); elm_win_indicator_mode_set(eo, ELM_WIN_INDICATOR_SHOW); - elm_win_profiles_set(eo, &str, 1); + // Do not set profile directly in application (Deprecated since Tizen 2.4) + //elm_win_profiles_set(eo, &str, 1); evas_object_smart_callback_add(eo, "delete,request", __ciss_win_del, NULL); elm_win_screen_size_get(eo, NULL, NULL, &w, &h); DBG("win w=%d h=%d", w, h); @@ -729,6 +730,7 @@ void _ciss_ug_new(void *data) ad->cbs = cbs; } +#ifdef PLATFORM_NOT_SUPPORTED static void __ciss_add_to_contact_list_clicked_cb(void *data, Evas_Object *obj, void *event_info) { DBG("Enter"); @@ -817,7 +819,6 @@ CONTACT_LIST_FAIL: return; } - void __ciss_create_add_to_contact_popup(void *data, const char *address) { DBG("Enter"); @@ -866,7 +867,6 @@ void __ciss_create_add_to_contact_popup(void *data, const char *address) // msg_ui_viewer_summary_view_disconnect_handler(ad); } - static void __ciss_cutlink_list_sel_cb(void *data, Evas_Object *obj, void *event_info) { DBG("Entry"); @@ -1222,7 +1222,6 @@ static void __ciss_anchor_clicked(void *data, Evas_Object *obj, void *event_info free(markup_content_text); } -#ifdef PLATFORM_NOT_SUPPORTED static Eina_Bool __ciss_match_cb(const uxt_cut_link_h cutlink, const char *text, int *start, int *end, const char *scheme, void *userdata) { DBG("Enter"); -- 2.7.4