From a79d5edfa940726afe8727dee94b219cf605ec51 Mon Sep 17 00:00:00 2001 From: Hyuk Lee Date: Tue, 26 Apr 2016 17:02:57 +0900 Subject: [PATCH] Modify the popup string issue Change-Id: Ie16359e53dec94185ceaed69d976bc5b54de7228 Signed-off-by: Hyuk Lee --- include/bt-widget.h | 2 ++ src/ui/bt-widget.c | 27 +++++++++++---------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/include/bt-widget.h b/include/bt-widget.h index c4645e2..dbda5ce 100644 --- a/include/bt-widget.h +++ b/include/bt-widget.h @@ -40,6 +40,8 @@ extern "C" { #define BT_GENLIST_MULTILINE_TEXT_STYLE "multiline" #define BT_GENLIST_GROUP_INDEX_STYLE "group_index" +#define BT_POPUP_STR_MAX_LEN 512 + Evas_Object *_bt_create_naviframe(Evas_Object *parent); Evas_Object *_bt_create_icon(Evas_Object *parent, char *img); diff --git a/src/ui/bt-widget.c b/src/ui/bt-widget.c index 42b2c32..3449f07 100644 --- a/src/ui/bt-widget.c +++ b/src/ui/bt-widget.c @@ -150,28 +150,26 @@ void _bt_set_popup_text(void *data, Evas_Object *popup) ret_if(!popup); bt_ug_data *ugd = (bt_ug_data *)data; - char *temp = NULL; + char temp[BT_POPUP_STR_MAX_LEN] = { 0 }; char *markup_text = NULL; + char *popup_text = NULL; switch(ugd->popup_data.type) { case BT_POPUP_PAIRING_ERROR : if (ugd->popup_data.data) { - temp = g_strdup_printf("%s %s", - BT_STR_UNABLE_TO_PAIR_WITH_PS, - (char *)ugd->popup_data.data); + popup_text = BT_STR_UNABLE_TO_PAIR_WITH_PS; + snprintf(temp, BT_POPUP_STR_MAX_LEN, popup_text, (char *)ugd->popup_data.data); } break; case BT_POPUP_CONNECTION_ERROR : if (ugd->popup_data.data) { - temp = g_strdup_printf("%s %s", - BT_STR_UNABLE_TO_CONNECT_TO_PS, - (char *)ugd->popup_data.data); + popup_text = BT_STR_UNABLE_TO_CONNECT_TO_PS; + snprintf(temp, BT_POPUP_STR_MAX_LEN, popup_text, (char *)ugd->popup_data.data); } break; case BT_POPUP_DISCONNECT : if (ugd->popup_data.data) { - temp = g_strdup_printf("%s %s", - BT_STR_END_CONNECTION, - (char *)ugd->popup_data.data); + popup_text = BT_STR_END_CONNECTION; + snprintf(temp, BT_POPUP_STR_MAX_LEN, popup_text, (char *)ugd->popup_data.data); } break; case BT_POPUP_GET_SERVICE_LIST_ERROR : @@ -182,12 +180,9 @@ void _bt_set_popup_text(void *data, Evas_Object *popup) break; } - if (temp) { - markup_text = elm_entry_utf8_to_markup(temp); - elm_object_text_set(popup, markup_text); - free(markup_text); - g_free(temp); - } + markup_text = elm_entry_utf8_to_markup(temp); + elm_object_text_set(popup, markup_text); + free(markup_text); } Evas_Object *_bt_create_popup(void *data, void *cb, -- 2.7.4