Main module cleaning

Change-Id: Ic1cbf0242f134103a8736071fb95ce93a660888a
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/include/setting-debug.h b/include/setting-debug.h
index a7f287dc6247d99817f9cb2ac87a3feebe6a7515..e65877a75a2aa2b0c57bf733704fe52b36693121 100755 (executable)
--- a/include/setting-debug.h
+++ b/include/setting-debug.h
@@ -87,8 +87,6 @@
 
 /*#endif*/
 
-#define SUPPORT_APP_ROATION            1
-
 /**< 1 : turn the low batter handlding off */
 #define         LOW_BATTERY_DO_NOTHING         1
 

diff --git a/include/setting.h b/include/setting.h
index 6a49aed48d85566827b93a765250292737f0d4a6..4fc5697e202c023697d7d6df6dd2fba437950ce7 100644 (file)
--- a/include/setting.h
+++ b/include/setting.h
@@ -172,10 +172,6 @@ typedef struct _setting_main_appdata {
        bool isInUGMode;                /**< set TRUE when UG is running */
 
        int current_rotation;
-       /* ---------------------------------------------------------- */
-       Ecore_Timer *event_freeze_timer;
-
-       /*bundle *b; */
 
        Cfg_Item_Type is_searchmode;
        Eina_Hash *main_list_hash;

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ea756017735d622a80c8b55d9669dc70352aa0ff..147029b33b5ef623efe7ba60b4b01efc0feac7c5 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,11 +19,6 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE -Werror-implicit-funct
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(BUILD_ARCH "${ARCH}")
 
-IF (BINARY_RELEASE_TYPE_ENG)
-       MESSAGE("eng binary--------------------------------")
-       ADD_DEFINITIONS("-DBINARY_RELEASE_TYPE_ENG")
-ENDIF (BINARY_RELEASE_TYPE_ENG)
-
 IF("${BUILD_ARCH}" STREQUAL "arm")
        ADD_DEFINITIONS("-DTARGET")
        MESSAGE("********************** add -DTARGET")

diff --git a/src/setting-handler.c b/src/setting-handler.c
index 6d704a4b8e2357cc24d0e69c4d2e905ae0611a91..e6ccd52a652da1f1700c22b158d55d683ccc0498 100644 (file)
--- a/src/setting-handler.c
+++ b/src/setting-handler.c
@@ -1,8 +1,5 @@
-#include <setting-handler.h>
-#include <setting-helper.h>
-
-#include <dbus/dbus.h>
-#include <app_control_internal.h>
+#include "setting-handler.h"
+#include "setting-helper.h"
 
 extern void setting_main_click_list_ex_ug_cb(void *data, Evas_Object *obj,
                void *event_info);
@@ -61,20 +58,7 @@ static Setting_GenGroupItem_Data *__developer_option_handler(void *data,
        SETTING_TRACE_BEGIN;
        setting_main_appdata *ad = (setting_main_appdata *)data;
        Setting_GenGroupItem_Data *obj = NULL;
-#ifdef BINARY_RELEASE_TYPE_ENG
-       /*for eng binary: always show <developer option>*/
-       obj = setting_create_Gendial_field_def(genlist,
-                       &(ad->itc_table[GENDIAL_Type_1text_1icon_2]),
-                       setting_main_click_list_ex_ug_cb,
-                       ug_args,
-                       SWALLOW_Type_1ICON_1IMAGE,
-                       icon_path,
-                       NULL, 0,
-                       keyStr,
-                       NULL,
-                       NULL);
 
-#else
        /*for user binary: need to check develop_option_state vconf value*/
        int dev_op_state = 0;
        int ret = 0;
@@ -96,7 +80,7 @@ static Setting_GenGroupItem_Data *__developer_option_handler(void *data,
        } else {
                SETTING_TRACE("dev_op_state is 0");
        }
-#endif
+
        return obj;
 }
 
@@ -241,20 +225,11 @@ void setting_main_click_list_item_ug_cb(void *data, Evas_Object *obj,
                return;
        }
        SETTING_TRACE("to create libug-%s.so", ug_to_load);
-       elm_object_tree_focus_allow_set(ad->md.naviframe, EINA_FALSE);
 
-       /*setting_conformant_keypad_state(ad->md.window, TRUE); */
        ad->ug = ug_create(NULL, ug_to_load, UG_MODE_FULLVIEW, svc, cbs);
        if (ad->ug) {
                ad->isInUGMode = TRUE;
        } else {
-               elm_object_tree_focus_allow_set(ad->md.naviframe, EINA_TRUE);
-               evas_object_show(ad->md.naviframe);
-               /*don't going to access globle var errno */
-               /*SETTING_TRACE_ERROR("errno:%d", errno); */
-               /*SETTING_TRACE_ERROR("Failed to load _TZ_SYS_RO_UG/lib/libug-
-                * %s.so", ug_to_load); */
-               /*SETTING_TRACE_ERROR("Failed to load lib-%s.so", ug_to_load);*/
                setting_create_popup(ad, ad->md.window, NULL, NO_UG_FOUND_MSG,
                                NULL, 0, false, false, 0);
        }
@@ -316,12 +291,7 @@ void setting_main_click_list_ex_ug_cb(void *data, Evas_Object *obj,
                return;
        }
        if (pnode && pnode->item_type == Cfg_Item_AppLauncher_Node) {
-               if (app_launcher(data, NULL, NULL) == 0) {
-                       ad->event_freeze_timer = ecore_timer_add(1,
-                                       setting_main_freeze_event_timer_cb, ad);
-                       evas_object_freeze_events_set(ad->md.naviframe,
-                                       EINA_TRUE);
-               }
+               app_launcher(data, NULL, NULL);
                click_times = setting_cfg_get_click_times(
                                selected_item_data->keyStr);
                setting_cfg_set_click_times(selected_item_data->keyStr,

diff --git a/src/setting-helper.c b/src/setting-helper.c
index d41bca344577b04cdbcccca48c7c2ab814ea486c..d0797ea90b410bbf6076dd61d8a54290bd23b9d9 100644 (file)
--- a/src/setting-helper.c
+++ b/src/setting-helper.c
@@ -1,16 +1,4 @@
-#include <setting-helper.h>
-
-Eina_Bool setting_main_freeze_event_timer_cb(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       retv_if(cb == NULL, EINA_FALSE);
-
-       setting_main_appdata *ad = (setting_main_appdata *)cb;
-
-       evas_object_freeze_events_set(ad->md.naviframe, EINA_FALSE);
-       ad->event_freeze_timer = NULL;
-       return EINA_FALSE;
-}
+#include "setting-helper.h"
 
 bool is_searchmode_app(Cfg_Item_Type type)
 {

diff --git a/src/setting-main.c b/src/setting-main.c
index 877f606e6277f9d004ef7d6b9a6c0c783cfab241..3e62133f2cf423482eaf813a94f86679489ab5ad 100644 (file)
--- a/src/setting-main.c
+++ b/src/setting-main.c
@@ -25,14 +25,10 @@
  *
  * first view has tabbar and Gengrid
  */
-#define _GNU_SOURCE
 
-#include <setting-main.h>
-#include <setting-handler.h>
-#include <setting-helper.h>
-
-#include <system_settings.h>
-#include <sqlite3.h>
+#include "setting-main.h"
+#include "setting-handler.h"
+#include "setting-helper.h"
 
 static int setting_main_create(void *cb);
 static int setting_main_destroy(void *cb);
@@ -41,7 +37,8 @@ setting_view setting_view_main = {
                .create = setting_main_create,
                .update = NULL,
                .destroy = setting_main_destroy,
-               .cleanup = NULL, };
+               .cleanup = NULL
+};
 
 /*/////////////////////////////////////////////////////////////////////////// */
 
@@ -205,33 +202,6 @@ static void _setting_genlist_itc_init(void *cb)
        setting_create_Gendial_itc(SETTING_GENLIST_GROUP_INDEX_STYLE, &(ad->itc_table[GENDIAL_Type_expandable_proc]));
 }
 
-static void _setting_tapi_init(void *cb)
-{
-       setting_main_appdata *ad = (setting_main_appdata *) cb;
-       /*pass NULL to let TAPI access default module */
-       ad->handle = tel_init(NULL);
-       if (!ad->handle)
-               SETTING_TRACE_ERROR("*** [ERR] tel_init failed ***");
-       else
-               SETTING_TRACE("tel_init ok[handle:%p]", ad->handle);
-}
-
-static void _setting_tapi_deinit(void *cb)
-{
-       setting_main_appdata *ad = (setting_main_appdata *)cb;
-
-       if (ad->handle) {
-               int tapi_ret = tel_deinit(ad->handle);
-               if (tapi_ret != TAPI_API_SUCCESS) {
-                       SETTING_TRACE_DEBUG("*** [ERR] tel_deinit. [%d] ***",
-                                       tapi_ret);
-               } else {
-                       SETTING_TRACE("***      tel_deinit OK ");
-               }
-               ad->handle = NULL;
-       }
-}
-
 /**
  * @brief create all view layout
  *
@@ -250,7 +220,6 @@ static int setting_main_create(void *cb)
        int ret = 0;
        retv_if(!ad, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       _setting_tapi_init(ad);
        _setting_genlist_itc_init(ad);
        settinig_drawer_hash_init(ad);
 
@@ -265,7 +234,6 @@ static int setting_main_create(void *cb)
                _view_list_geter(ad);
 
        setting_view_main.is_create = 1;
-       LAUNCH_SETTING_OUT();
        SETTING_TRACE_END;
        return SETTING_RETURN_SUCCESS;
 }
@@ -282,22 +250,9 @@ static int setting_main_destroy(void *cb)
                return SETTING_RETURN_SUCCESS;
        }
        evas_object_data_set(ad->md.window, "conformant", NULL);
-       _setting_tapi_deinit(ad);
-
-       if (ad->event_freeze_timer) {
-               ecore_timer_del(ad->event_freeze_timer);
-               ad->event_freeze_timer = NULL;
-       }
 
        setting_view_main.is_create = 0;
        SETTING_TRACE_END;
        return SETTING_RETURN_SUCCESS;
 }
 
-/* ***************************************************
- *
- *general func
- *
- ***************************************************/
-/*///////////////////////////////////////////////////////////////////////// */
-

diff --git a/src/setting.c b/src/setting.c
index 710146cd3b805a2e8ad18c437e0b0ef7c7777203..35f5c2a4718df820639f41f48bde1d2b8cffb482 100755 (executable)
--- a/src/setting.c
+++ b/src/setting.c
@@ -25,27 +25,10 @@
 #include "setting-cfg.h"
 #include "setting-common-init.h"
 
-#include <app.h>
-#include <appcore-common.h>
-#include <sensor.h>
-#include <aul.h>
-#include <elm_object.h>
-#include <signal.h>
 #include <system_settings.h>
-#include <bundle_internal.h>
 
 setting_main_appdata *g_main_ad;
 
-void termination_handler(int signum)
-{
-       SETTING_TRACE_BEGIN;
-       /* do something for signal handling */
-       /*SETTING_TRACE_DEBUG(
-        * ">>>>>>>>>>>>>>>>> SIGTERM >>>>>>>>>>>>>>> SETTING "); */
-
-       elm_exit();
-}
-
 #if LOW_BATTERY_DO_NOTHING
 
 /*     in case of low battery, don't terminate itself.*/
@@ -64,21 +47,6 @@ static void setting_main_low_battery_cb(app_event_info_h event_info, void *data)
 }
 #endif
 
-#if SUPPORT_APP_ROATION
-static void _rot_changed_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       setting_main_appdata *ad = (setting_main_appdata *)data;
-       ret_if(ad == NULL || ad->md.window == NULL);
-       int change_ang = elm_win_rotation_get(ad->md.window);
-
-       SETTING_TRACE_DEBUG("....change_ang:%d", change_ang);
-       SETTING_TRACE_DEBUG("current_rotation:%d", ad->current_rotation);
-
-       ad->current_rotation = change_ang;
-}
-#endif
-
 /**
  * The event process when region is changes.
  */
@@ -95,19 +63,16 @@ static void setting_main_lang_changed_cb(app_event_info_h event_info,
                void *data)
 {
        SETTING_TRACE_BEGIN;
+       char *localeLanguage = NULL;
        retm_if(!data, "Invalid argument: data is NULL");
-       /*FIX the crash when switch from Portrait mode to landscape mode, */
-       /*It is so strange the data is no longer correct */
-       /*and ....why it is invoked */
-       /*setting_main_appdata *ad = data; */
+
        setting_main_appdata *ad = g_main_ad;
 
        elm_object_item_part_text_set(ad->md.naviframe_it, "elm.text.title",
                        _("IDS_ST_OPT_SETTINGS"));
-       /*setting_navi_items_update(ad->md.window); */
+
        elm_genlist_realized_items_update(ad->sc_gl[SC_All_List]);
 
-       char *localeLanguage = NULL;
        system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE,
                        &localeLanguage);
        elm_language_set(localeLanguage);
@@ -134,20 +99,14 @@ static void setting_main_lang_changed_cb(app_event_info_h event_info,
 static bool setting_main_app_create(void *data)
 {
        SETTING_TRACE_BEGIN; LAUNCH_SETTING_IN();
-       SETTING_TRACE_DEBUG("[TIME] 3. it took %d msec from main to setting_main_app_create ",
-                       appcore_measure_time());
-       appcore_measure_start();
 
 #if SUPPORT_DRI
        setenv("EVAS_DRI_SWAPBUF", "1", 1);
 #endif
 
        setting_main_appdata *ad = data;
-       /* regitering sigterm */
-       if (signal(SIGTERM, termination_handler) == SIG_IGN)
-               signal(SIGTERM, SIG_IGN);
 
-       app_event_handler_h handlers[5] = { NULL, };
+       app_event_handler_h handlers[5] = {NULL, };
 #if LOW_BATTERY_DO_NOTHING
        ui_app_add_event_handler(&handlers[APP_EVENT_LOW_BATTERY],
                        APP_EVENT_LOW_BATTERY, setting_main_low_battery_cb, ad);
@@ -168,12 +127,6 @@ static bool setting_main_app_create(void *data)
        if (app_init(&ad->md, SETTING_PACKAGE) != SETTING_RETURN_SUCCESS)
                return false;
 
-       ad->current_rotation = elm_win_rotation_get(ad->md.window);
-       SETTING_TRACE_DEBUG("ad->current_rotation:%d", ad->current_rotation);
-
-       evas_object_smart_callback_add(ad->md.window, "wm,rotation,changed",
-                       _rot_changed_cb, ad);
-
        /* load config file */
        int cfg_operation_ret = setting_cfg_init();
 
@@ -231,10 +184,6 @@ static bool setting_main_app_create(void *data)
                return SETTING_RETURN_FAIL;
        }
 
-       SETTING_TRACE_DEBUG("[TIME] 4. setting_main_app_create taked %d msec ",
-                       appcore_measure_time());
-       appcore_measure_start();
-       LAUNCH_SETTING_OUT();
        return true;
 }
 
@@ -246,8 +195,6 @@ static void setting_main_app_terminate(void *data)
        SETTING_TRACE_BEGIN;
        setting_main_appdata *ad = data;
        vconf_set_bool(VCONFKEY_SETAPPL_ROTATE_HOLD_BOOL, FALSE);
-       evas_object_smart_callback_del(ad->md.window, "wm,rotation,changed",
-                       _rot_changed_cb);
 
        /*PLUGIN_FINI; */
        setting_cfg_exit();
@@ -260,15 +207,6 @@ static void setting_main_app_terminate(void *data)
        ad->md.window = NULL;
 
        SETTING_TRACE_END;
-       return;
-}
-
-/**
- * The function is called when Setting begins run in background from forground
- */
-static void setting_main_app_pause(void *data)
-{
-       SETTING_TRACE_BEGIN;
 }
 
 /**
@@ -316,23 +254,16 @@ static void setting_main_app_reset(app_control_h service, void *data)
 EXPORT_PUBLIC
 int main(int argc, char *argv[])
 {
-       setting_main_appdata ad;
-
-       SETTING_TRACE_DEBUG(
-                       "[TIME] 1. aul_launch -> main :: Setting main : %d msec ",
-                       appcore_measure_time_from("APP_START_TIME"));
-       appcore_measure_start();
+       setting_main_appdata ad = {};
 
        ui_app_lifecycle_callback_s ops = {
                        .create = setting_main_app_create,
                        .terminate = setting_main_app_terminate,
-                       .pause = setting_main_app_pause,
+                       .pause = NULL,
                        .resume = setting_main_app_resume,
-                       .app_control = setting_main_app_reset, };
-       memset(&ad, 0x00, sizeof(setting_main_appdata));
+                       .app_control = setting_main_app_reset
+       };
+       memset(&ad, 0, sizeof(setting_main_appdata));
 
-       SETTING_TRACE_DEBUG("[TIME] 2. main : %d msec ",
-                       appcore_measure_time());
-       appcore_measure_start();
        return ui_app_main(argc, argv, &ops, &ad);
 }