Replace elm_exit() with ui_app_exit() 32/41032/1
authorSungmin Kwak <sungmin.kwak@samsung.com>
Tue, 26 May 2015 07:27:00 +0000 (16:27 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Thu, 11 Jun 2015 04:14:16 +0000 (13:14 +0900)
Change-Id: If91995d1fbe4ba1a9cc5beda4de6681d000c9d60

im_setting_list/input_method_setting_list.cpp
im_setting_list/input_method_setting_list_ui.cpp
im_setting_selector/input_method_setting_selector_ui.cpp

index 8840e6e..3551f1b 100644 (file)
@@ -39,15 +39,15 @@ app_control(app_control_h app_control, void *data)
     appdata *ad = (appdata *)data;
     LOGD("");
 
-     if(ad->app_state == APP_STATE_PAUSE || ad->app_state == APP_STATE_RESUME)
-     {
-         if (ad->win)
-         {
-             elm_win_activate(ad->win);
-             im_setting_list_update_window(ad);
-         }
-         ad->app_state = APP_STATE_SERVICE;
-         return;
+    if(ad->app_state == APP_STATE_PAUSE || ad->app_state == APP_STATE_RESUME)
+    {
+        if (ad->win)
+        {
+            elm_win_activate(ad->win);
+            im_setting_list_update_window(ad);
+        }
+        ad->app_state = APP_STATE_SERVICE;
+        return;
     }
 
     char* type = NULL;
index 6d1e857..a02877c 100644 (file)
@@ -499,7 +499,7 @@ static Eina_Bool im_setting_list_navi_item_pop_cb(void *data, Elm_Object_Item *i
     in_exit = true;
     if (data == NULL)
         return EINA_TRUE;
-    elm_exit();
+    ui_app_exit();
     return EINA_TRUE;
 }
 
index 034d6a8..963e70d 100644 (file)
@@ -169,7 +169,7 @@ static void im_setting_selector_ise_sel_cb(void *data, Evas_Object *obj, void *e
     if (!item)
         return;
     im_setting_selector_update_radio_state(item, obj, index);
-    elm_exit();
+    ui_app_exit();
 }
 
 static Evas_Object *im_setting_selector_genlist_create(Evas_Object* parent)
@@ -282,7 +282,7 @@ static Eina_Bool im_setting_list_navi_item_pop_cb(void *data, Elm_Object_Item *i
      in_exit = true;
      if (data == NULL)
          return EINA_TRUE;
-     elm_exit();
+     ui_app_exit();
      return EINA_TRUE;
 }
 
@@ -337,7 +337,7 @@ im_setting_selector_app_create(void *data)
 void
 im_setting_selector_app_pause(void *data)
 {
-    elm_exit();
+    ui_app_exit();
 }
 
 void im_setting_selector_app_terminate(void *data)