Fix crash issue about item_style in elm_naviframe_item_push

Change-Id: I7618d2a18d1f60545a2a2d7f786f9c4b704068e7
Signed-off-by: sungwook79.park <sungwook79.park@samsung.com>

diff --git a/src/MoreOption.cpp b/src/MoreOption.cpp
index d0a4b36..5159e0c 100755 (executable)
--- a/src/MoreOption.cpp
+++ b/src/MoreOption.cpp
@@ -119,7 +119,10 @@ void MoreOption::SetContentLayout(Evas_Object *content) {
        elm_object_part_content_set(more_option_layout, "elm.swallow.content", content);
 
        Elm_Object_Item *nit = NULL;
-       nit = elm_naviframe_item_push(nf, NULL, NULL, NULL, more_option_layout, "empty");
+       const char *item_style = NULL;
+       if (_WEARABLE)
+               item_style = "empty";
+       nit = elm_naviframe_item_push(nf, NULL, NULL, NULL, more_option_layout, item_style);
        elm_naviframe_item_title_enabled_set(nit, EINA_FALSE, EINA_FALSE);
 
        elm_naviframe_item_pop_cb_set(nit,

diff --git a/src/w-input-emoticon.cpp b/src/w-input-emoticon.cpp
index b7afb02..6c988c0 100755 (executable)
--- a/src/w-input-emoticon.cpp
+++ b/src/w-input-emoticon.cpp
@@ -767,7 +767,10 @@ Evas_Object* _create_emoticon_genlist(void* data)
     evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_show(genlist);
 
-    Elm_Object_Item *nf_emoticon_item = elm_naviframe_item_push(ad->naviframe, NULL, NULL, NULL, genlist, "empty");
+    const char *item_style = NULL;
+    if (_WEARABLE)
+        item_style = "empty";
+    Elm_Object_Item *nf_emoticon_item = elm_naviframe_item_push(ad->naviframe, NULL, NULL, NULL, genlist, item_style);
 
     elm_naviframe_item_pop_cb_set(nf_emoticon_item, _custom_back_cb2, ad);
 

diff --git a/src/w-input-keyboard.cpp b/src/w-input-keyboard.cpp
index 0bfa13f..52051a6 100755 (executable)
--- a/src/w-input-keyboard.cpp
+++ b/src/w-input-keyboard.cpp
@@ -134,7 +134,10 @@ void create_fullscreen_editor(void *data)
        evas_object_resize(ad->naviframe, 360, 360);
        evas_object_show(ad->naviframe);
 
-       Elm_Object_Item *nf_item = elm_naviframe_item_push(ad->naviframe, NULL, NULL, NULL, box, "empty");
+       const char *item_style = NULL;
+       if (_WEARABLE)
+               item_style = "empty";
+       Elm_Object_Item *nf_item = elm_naviframe_item_push(ad->naviframe, NULL, NULL, NULL, box, item_style);
        elm_naviframe_item_pop_cb_set(nf_item, custom_back_cb, NULL);
 }
 

diff --git a/src/w-input-selector.cpp b/src/w-input-selector.cpp
index 4c39358..6b096cb 100755 (executable)
--- a/src/w-input-selector.cpp
+++ b/src/w-input-selector.cpp
@@ -608,12 +608,15 @@ Evas_Object* _create_genlist(Evas_Object* navi)
 
        show_gl_focus(EINA_FALSE);
 
+       const char *item_style = NULL;
+       if (_WEARABLE)
+               item_style = "empty";
        Elm_Object_Item *nf_main_item = elm_naviframe_item_push(navi,
             NULL,
             NULL,
             NULL,
             genlist,
-            "empty");
+            item_style);
 
        elm_naviframe_item_pop_cb_set(nf_main_item, back_cb, app_data);
        evas_object_smart_callback_add(genlist, "realized", _item_realized, NULL);

diff --git a/src/w-input-stt-voice.cpp b/src/w-input-stt-voice.cpp
index 10a5ec5..7fe546f 100755 (executable)
--- a/src/w-input-stt-voice.cpp
+++ b/src/w-input-stt-voice.cpp
@@ -1324,8 +1324,11 @@ void create_setting_window(Evas_Object *more_option_layout)
         */
        genlist = create_language_list(naviframe);
 
+       const char *item_style = NULL;
+       if (_WEARABLE)
+               item_style = "empty";
        //item = elm_naviframe_item_push(naviframe, "IDS_VC_HEADER_VOICE_INPUT_LANGUAGE", NULL, NULL, genlist, NULL);
-       elm_naviframe_item_push(naviframe, NULL, NULL, NULL, genlist, "empty");
+       elm_naviframe_item_push(naviframe, NULL, NULL, NULL, genlist, item_style);
        //elm_object_item_domain_text_translatable_set(item, PACKAGE, EINA_TRUE);
 
        g_setting_window = window;