Change elm_exit to ui_app_exit 14/129814/1
authorsungwook79.park <sungwook79.park@samsung.com>
Thu, 18 May 2017 07:20:47 +0000 (16:20 +0900)
committersungwook79.park <sungwook79.park@samsung.com>
Thu, 18 May 2017 07:20:47 +0000 (16:20 +0900)
Change-Id: I78589fc32e928d2e75212725eaa7ad2b98ce1441
Signed-off-by: sungwook79.park <sungwook79.park@samsung.com>
src/w-input-emoticon.cpp
src/w-input-keyboard.cpp
src/w-input-selector.cpp
src/w-input-stt-voice.cpp

index f0c64f2..e953c59 100755 (executable)
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <app.h>
 #include <app_preference.h>
 #include <Elementary.h>
 #include <string>
@@ -380,7 +381,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){
index 0bfa13f..74a3141 100755 (executable)
@@ -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)
index f5a426e..6fd360c 100755 (executable)
@@ -108,9 +108,9 @@ 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();
-    return EINA_FALSE;
+       reply_to_sender_by_callback_for_back();
+       ui_app_exit();
+       return EINA_FALSE;
 }
 
 static void _stt_clicked_cb(void *data, Evas_Object * obj, void *event_info)
@@ -465,7 +465,7 @@ void _back_to_genlist_for_selector()
        if(app_data->app_type == APP_TYPE_STT || app_data->app_type == APP_TYPE_EMOTICON){
                PRINTFUNC(DLOG_DEBUG, "launched as STT/EMOTICON mode, So exit here.");
                reply_to_sender_by_callback(NULL, NULL);
-               elm_exit();
+               ui_app_exit();
        }
 
        Evas_Object *circle_genlist = (Evas_Object *) evas_object_data_get(app_data->genlist, "circle");
index 56514f7..9c40ac3 100755 (executable)
@@ -475,7 +475,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;
 }