From 8458c11b54c012bc2999fc2e2e7b21d295e0b53a Mon Sep 17 00:00:00 2001 From: "sungwook79.park" Date: Thu, 18 May 2017 14:08:15 +0900 Subject: [PATCH] Change elm_exit to ui_app_exit Change-Id: Ic30784c4f6024e1c8d04aa4f93bd335d1db37f60 Signed-off-by: sungwook79.park --- src/w-input-emoticon.cpp | 3 ++- src/w-input-keyboard.cpp | 2 +- src/w-input-selector.cpp | 6 +++--- src/w-input-stt-voice.cpp | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/w-input-emoticon.cpp b/src/w-input-emoticon.cpp index 6c988c0..0ead5fb 100755 --- a/src/w-input-emoticon.cpp +++ b/src/w-input-emoticon.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include #include #include @@ -381,7 +382,7 @@ static void _emoticon_item_clicked_cb(void *data, Evas_Object * obj, void *event if (utf_8) free(utf_8); - elm_exit(); + ui_app_exit(); } Evas_Object* get_emoticon_button(Evas_Object* parent, int index){ diff --git a/src/w-input-keyboard.cpp b/src/w-input-keyboard.cpp index d7e2bf2..50d30c1 100755 --- a/src/w-input-keyboard.cpp +++ b/src/w-input-keyboard.cpp @@ -83,7 +83,7 @@ void btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) set_source_caller_app_id(app_control); free(app_id); reply_to_sender_by_callback(getText, "keyboard"); - elm_exit(); + ui_app_exit(); } static Eina_Bool custom_back_cb(void *data, Elm_Object_Item *it) diff --git a/src/w-input-selector.cpp b/src/w-input-selector.cpp index b79534b..010d98b 100755 --- a/src/w-input-selector.cpp +++ b/src/w-input-selector.cpp @@ -152,7 +152,7 @@ void init_customizing_theme(void) static Eina_Bool back_cb(void *data, Elm_Object_Item *it) { reply_to_sender_by_callback_for_back(); - elm_exit(); + ui_app_exit(); return EINA_FALSE; } @@ -210,7 +210,7 @@ static void __ise_template_gl_sel(void *data, Evas_Object *obj, void *event_info if (index < (int)template_list.size()) { reply_to_sender_by_callback(gettext(template_list[index].text.c_str()), "template"); - elm_exit(); + ui_app_exit(); } } } @@ -576,7 +576,7 @@ void _back_to_genlist_for_selector() if (app_data->app_type == APP_TYPE_STT || app_data->app_type == APP_TYPE_EMOTICON || app_data->app_type == APP_TYPE_KEYBOARD){ PRINTFUNC(DLOG_DEBUG, "launched as STT/EMOTICON/KEYBOARD mode, So exit here."); reply_to_sender_by_callback(NULL, NULL); - elm_exit(); + ui_app_exit(); } } diff --git a/src/w-input-stt-voice.cpp b/src/w-input-stt-voice.cpp index 7fe546f..0aa4b21 100755 --- a/src/w-input-stt-voice.cpp +++ b/src/w-input-stt-voice.cpp @@ -476,7 +476,7 @@ static void on_confirm_button_clicked_cb(void *data, Evas_Object *obj, void *eve reply_to_sender_by_callback(result_text.c_str(), "voice"); destroy_voice(); powerUnlock(); - elm_exit(); + ui_app_exit(); return; } -- 2.7.4