Warnings removal: profile, ringtone, security, storage, time 58/57958/2
authorRadek Kintop <r.kintop@samsung.com>
Tue, 26 Jan 2016 09:49:25 +0000 (10:49 +0100)
committerRadek Kintop <r.kintop@samsung.com>
Tue, 26 Jan 2016 09:57:59 +0000 (01:57 -0800)
Change-Id: I71f1f6c69814b8e38ba1aad3bc503d72962dc5a5
Signed-off-by: Radek Kintop <r.kintop@samsung.com>
17 files changed:
setting-common/include/setting-common-draw-widget.h
setting-common/src/setting-common-draw-genlist.c
setting-profile/src/setting-profile-common.c
setting-profile/src/setting-profile-sound-main.c
setting-profile/src/volume_popup.c
setting-ringtone/src/setting-ringtone-main.c
setting-ringtone/src/setting-ringtone-util.c
setting-security/src/setting-security-main.c
setting-security/src/setting-security-update.c
setting-security/src/setting-security.c
setting-storage/src/setting-storage-SD.c
setting-storage/src/setting-storage-default.c
setting-storage/src/setting-storage-main.c
setting-storage/src/setting-storage-miscellaneous.c
setting-storage/src/setting-storage-utils.c
setting-storage/src/setting-storage.c
setting-time/src/setting-time-main.c

index 185232bba0c3bce3ec70e553d480c556ab9d8a8b..1375556fa9d2a3b84ff1a98b440f70acd08333bb 100755 (executable)
@@ -109,6 +109,7 @@ extern const Elm_Genlist_Item_Class itc_bottom_line;
                }\
        }
 
+/*TODO: remove this:*/
 #define ADD_GL_HELP(scroller, str) \
        {\
                if (str) {\
@@ -122,20 +123,7 @@ extern const Elm_Genlist_Item_Class itc_bottom_line;
                }\
        }
 
-#ifdef OLD_GENLIST_STYLE
-#define ADD_GL_HELP_NO_SEP(scroller, str) \
-       {\
-               if (str) {\
-                       Setting_GenGroupItem_Data *item_data = setting_create_Gendial_field_def(scroller, &itc_multiline_text,\
-                                                                                               NULL,\
-                                                                                               NULL,\
-                                                                                               SWALLOW_Type_LAYOUT_SPECIALIZTION_X,\
-                                                                                               NULL, NULL, 0, str, NULL, NULL);\
-                       setting_retvm_if(NULL == item_data, NULL, "item_data is NULL");\
-                       elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
-               }\
-       }
-#else
+/*TODO remove this:*/
 #define ADD_GL_HELP_NO_SEP(scroller, str) \
        {\
                if (str) {\
@@ -148,8 +136,6 @@ extern const Elm_Genlist_Item_Class itc_bottom_line;
                        elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
                }\
        }
-#endif
-
 
 #define ADD_GL_BUTTON(scroller, btn_str, btn_cb, cb_data) \
        {\
@@ -364,6 +350,8 @@ extern Setting_GenGroupItem_Data *setting_create_Gendial_field_def(Evas_Object *
                                                                    char *sub_desc,
                                                                    setting_call_back_func chk_change_cb);
 
+extern void setting_add_gl_help(Evas_Object *scroller, const char *str);
+
 extern Setting_GenGroupItem_Data *setting_create_Gendial_field_entry_with_return_key(Evas_Object *
         genlist,
         const Elm_Genlist_Item_Class *itc,
index 58b93f10d75b1395346ef28b649d6e1dc2b676ff..a2abf62d310b67f890f6a7cb9e02b7d37da28604 100644 (file)
@@ -2120,6 +2120,22 @@ EXPORT_PUBLIC Setting_GenGroupItem_Data *setting_create_Gendial_field_def(Evas_O
                                                      chk_change_cb);
 }
 
+EXPORT_PUBLIC void setting_add_gl_help(Evas_Object *scroller, const char *str)
+{
+       if (str) {
+               Setting_GenGroupItem_Data *item_data = setting_create_Gendial_field_def(scroller, &itc_multiline_text,
+                                                                                       NULL,
+                                                                                       NULL,
+                                                                                       SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
+                                                                                       NULL, NULL, 0, str, NULL, NULL);
+               if(NULL == item_data) {
+                       SETTING_TRACE_ERROR("item_data is NULL");
+                       return;
+               }
+               elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+       }
+}
+
 /**
  * Create 1entry style item with parameter return_key_type
  * @return a pointer to Setting_GenGroupItem_Data
index 394d6cf2a1ecbff36adb059d404de159e3ab1210..51fa8d9d0ae854396c719c756d32478a55b85583 100644 (file)
@@ -199,56 +199,6 @@ static Evas_Object *__sound_slider_new_icon_get(void *data, Evas_Object *obj, co
        return NULL;
 }
 
-
-
-static Evas_Object *__sound_slider_icon_get(void *data, Evas_Object *obj, const char *part)
-{
-       /*SETTING_TRACE_BEGIN; */
-       /*appcore_measure_start(); */
-       retv_if(data == NULL, NULL);
-
-       if (safeStrCmp(part, "elm.icon")) {
-               /*SETTING_TRACE("EDC part [%s]", part); */
-               return NULL;
-       }
-
-       Setting_GenGroupItem_Data *item_data = (Setting_GenGroupItem_Data *)data;
-       Evas_Object *slider = setting_create_slider(obj, item_data->evas,
-                                                   item_data->l_swallow_path,
-                                                   item_data->r_swallow_path,
-                                                   item_data->chk_status,
-                                                   item_data->isIndicatorVisible,
-                                                   item_data->slider_min,
-                                                   item_data->slider_max,
-                                                   item_data->chk_change_cb,
-                                                   item_data->start_change_cb,
-                                                   item_data->stop_change_cb,
-                                                   item_data);
-
-       if (slider == NULL)
-               return NULL;
-       if (0 == safeStrCmp(item_data->keyStr, "IDS_ST_BODY_MEDIA")) {
-               elm_object_style_set(slider, "warning");
-
-               Edje_Message_Float_Set *msg = alloca(sizeof(Edje_Message_Float_Set) + (sizeof(double)));
-               msg->count = 1;
-               msg->val[0] = 0.66667;
-               edje_object_message_send(_EDJ(slider), EDJE_MESSAGE_FLOAT_SET, 0, msg);
-               elm_slider_indicator_format_set(slider, "%1.0f");
-               elm_slider_indicator_show_set(slider, 1);
-       }
-
-       item_data->eo_check = slider;
-
-       evas_object_pass_events_set(slider, EINA_TRUE);
-       evas_object_propagate_events_set(slider, EINA_FALSE);
-
-       if (item_data->userdata == NULL)
-               return NULL;
-
-       return slider;
-}
-
 /* ***************************************************
  *
  *general func
@@ -348,7 +298,7 @@ static void __enable_sound_menu(void *data)
                if (ad->is_ringtone_slidering) return;/*do need to restore from BACKUP VOLUME */
 
                int mm_value = 0;
-               int ret =  sound_manager_get_volume(SOUND_TYPE_RINGTONE, &mm_value);
+               sound_manager_get_volume(SOUND_TYPE_RINGTONE, &mm_value);
                if (mm_value <= 0) mm_value = 1;
                /*SETTING_TRACE("ret:%d", ret); */
                sound_manager_set_volume(SOUND_TYPE_RINGTONE, mm_value);
@@ -767,7 +717,7 @@ static Eina_Bool __volume_key_down_cb(void *data, int type, void *event)
                        }
                } else {
                        SETTING_TRACE("sound_type == SOUND_TYPE_RINGTONE")
-                       int ret =  sound_manager_get_volume(SOUND_TYPE_RINGTONE, &volume);
+                       sound_manager_get_volume(SOUND_TYPE_RINGTONE, &volume);
                        /*ad->backup_ringtong_volume = volume; */
                        /*vconf_set_int(VCONFKEY_SETAPPL_RINGTONE_BACKUP_VOLUME, ad->backup_ringtong_volume); */
                        /*SETTING_TRACE("ret:%d, volume:%d, ad->backup_ringtong_volume:%d", ret, volume, ad->backup_ringtong_volume); */
@@ -909,9 +859,8 @@ void __setting_sound_ug_key_grab(SettingProfileUG *ad)
 #ifdef ECORE_X
        Ecore_X_Window xwin = 0;
        Ecore_X_Display *disp = NULL;
-#endif
-
        int ret = 0;
+#endif
 
        if (ad == NULL)
                return;
@@ -957,9 +906,8 @@ void __setting_sound_ug_key_ungrab(SettingProfileUG *ad)
 #ifdef ECORE_X
        Ecore_X_Window xwin = 0;
        Ecore_X_Display *disp = NULL;
-#endif
-
        int ret = 0;
+#endif
 
        if (ad == NULL)
                return;
@@ -1096,7 +1044,7 @@ void setting_sound_create_warning_popup_during_call(void *data)
        ret_if(data == NULL);
        SettingProfileUG *ad = (SettingProfileUG *) data;
 
-       int call_status = CM_CALL_STATUS_IDLE;
+       cm_call_status_e call_status = CM_CALL_STATUS_IDLE;
        cm_client_h cm_handle = NULL;
        cm_init(&cm_handle);
        cm_get_call_status(cm_handle, &call_status);
index a26f5b756868edf06ff213294a3bfdc03b6438ae..485518d88f699430abfd98de65e10a8d8c1539d6 100644 (file)
@@ -25,6 +25,7 @@
 #include <setting-profile-sound-main.h>
 #include <setting-profile.h>
 #include <setting-common-general-func.h>
+#include <setting-common-draw-widget.h>
 
 #include <eventsystem.h>
 #include <bundle_internal.h>
@@ -42,6 +43,7 @@ static int setting_sound_main_create(void *cb);
 static int setting_sound_main_destroy(void *cb);
 static int setting_sound_main_update(void *cb);
 static int setting_sound_main_cleanup(void *cb);
+static void __sound_chk_cb(void *data, Evas_Object *obj, void *event_info);
 
 setting_view setting_view_sound_main = {
        .create = setting_sound_main_create,
@@ -50,49 +52,43 @@ setting_view setting_view_sound_main = {
        .cleanup = setting_sound_main_cleanup,
 };
 
-#define ADD_GENLIST(genlist, parent) \
-       {\
-               genlist = elm_genlist_add(parent);\
-               retvm_if(genlist == NULL, NULL, "Cannot set genlist object as contento of layout");\
-               elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);\
-               elm_object_style_set(genlist, "dialogue");\
-               elm_genlist_clear(genlist);\
-               evas_object_smart_callback_add(genlist, "realized", __gl_realized_cb, NULL);\
-               elm_scroller_policy_set(genlist, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);\
-       }
+static void __add_genlist(Evas_Object *genlist, Evas_Object *parent)
+{
+       genlist = elm_genlist_add(parent);
 
-/* keystr, toggle */
-#define ADD_TOGGLE_MENU2(item, genlist, item_style, keystr, value, data) \
-       {\
-               item = setting_create_Gendial_field_def(genlist, &(item_style), \
-                                                       setting_sound_main_mouse_up_Gendial_list_cb, \
-                                                       data, SWALLOW_Type_1ICON_1RADIO, NULL, \
-                                                       NULL, value, \
-                                                       keystr, NULL, \
-                                                       __sound_chk_cb); \
-               if (item) { \
-                       item->userdata = data; \
-               } else { \
-                       SETTING_TRACE_ERROR("%s item is NULL", keystr); \
-               } \
+       if(!genlist) {
+               SETTING_TRACE_ERROR("Cannot set genlist object as contento of layout");
+               return;
        }
+       elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
+       elm_object_style_set(genlist, "dialogue");
+       elm_genlist_clear(genlist);
+       evas_object_smart_callback_add(genlist, "realized", __gl_realized_cb, NULL);
+       elm_scroller_policy_set(genlist, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
+}
 
-/* keystr, multiline, toggle */
-#define ADD_TOGGLE_MENU(item, genlist, item_style, keystr, substr, value, data) \
-       {\
-               item = setting_create_Gendial_field_def(genlist, &(item_style), \
-                                                       setting_sound_main_mouse_up_Gendial_list_cb, \
-                                                       data, SWALLOW_Type_1ICON_1RADIO, NULL, \
-                                                       NULL, value, \
-                                                       keystr, NULL, \
-                                                       __sound_chk_cb); \
-               if (item) { \
-                       item->userdata = data;\
-               } else { \
-                       SETTING_TRACE_ERROR("%s item is NULL", keystr);\
-               } \
-               ADD_GL_HELP_NO_SEP(genlist, substr);\
+static void __add_toggle_menu(Setting_GenGroupItem_Data *item,
+               Evas_Object *genlist,
+               Elm_Genlist_Item_Class item_style,
+               const char *keystr,
+               const char *substr,
+               int value,
+               SettingProfileUG *data)
+{
+       item = setting_create_Gendial_field_def(genlist, &(item_style),
+                                               setting_sound_main_mouse_up_Gendial_list_cb,
+                                               data, SWALLOW_Type_1ICON_1RADIO, NULL,
+                                               NULL, value,
+                                               keystr, NULL,
+                                               __sound_chk_cb);
+       if (item) {
+               item->userdata = data;
+       } else {
+               SETTING_TRACE_ERROR("%s item is NULL", keystr);
        }
+       if (substr)
+               setting_add_gl_help(genlist, substr);
+}
 
 #define ADD_SOUND_SLIDER(item_data, genlist, item_style, l_img, r_img, value, keystr, data, sld_cb, sld_max, start_cb, stop_cb) \
        { \
@@ -482,13 +478,15 @@ char *setting_do_not_disturb_is_enable(void *data)
 {
        int err = NOTIFICATION_ERROR_NONE;
        bool do_not_disturb;
-       char *desc;
        notification_system_setting_h system_setting = NULL;
 
        err = notification_system_setting_load_system_setting(&system_setting);
-       setting_retvm_if(NULL == system_setting || NOTIFICATION_ERROR_NONE != err,
-                                                                       SETTING_GENERAL_ERR_NULL_DATA_PARAMETER,
-                                                                       "notification_system_setting_load_system_Setting failed");
+
+       if(NULL == system_setting || NOTIFICATION_ERROR_NONE != err) {
+               SETTING_TRACE_ERROR("notification_system_setting_load_system_Setting failed");
+               return "notification_system_setting_load_system_Setting failed";
+       }
+
        err = notification_system_setting_get_do_not_disturb(system_setting, &do_not_disturb);
        SETTING_TRACE("do_not_disturb: %d", do_not_disturb);
 
@@ -700,7 +698,9 @@ static void __get_lite_main_list(void *data)
                if (vconf_get_bool(VCONFKEY_SETAPPL_VIBRATE_WHEN_RINGING_BOOL, &vconf_value) < 0) {
                        vconf_value = TRUE;     /*  default value of vibrate sound : on */
                }
-               ADD_TOGGLE_MENU2(ad->data_sound_when_ring, genlist, itc_1text_1icon, "IDS_ST_BODY_VIBRATE_WHEN_RINGING", vconf_value, ad);
+
+               __add_toggle_menu(ad->data_sound_when_ring, genlist, itc_1text_1icon,
+                                                       "IDS_ST_BODY_VIBRATE_WHEN_RINGING", NULL, vconf_value, ad);
                __BACK_POINTER_SET(ad->data_sound_when_ring);
                setting_genlist_item_disabled_set(ad->data_sound_when_ring, !sound_value);
 
@@ -753,24 +753,22 @@ void vibration_state_event_handler(const char *event_name, bundle *data, void *u
        SETTING_TRACE("vibration_state_set(%s)", vibration_state_set);
 }
 
-int vibration_state_reg_id;
+unsigned int vibration_state_reg_id;
 
-static Eina_Bool
+static void
 setting_soudn_main_click_softkey_back_cb(void *data, Evas_Object *obj,
                                          void *event_info)
 {
        SETTING_TRACE_BEGIN;
        /* error check */
-       setting_retvm_if(data == NULL, EINA_FALSE,
-                        "[Setting > Display] Data parameter is NULL");
+       if(data == NULL)
+               return;
 
        SettingProfileUG *ad = (SettingProfileUG *) data;
 
        /* Send destroy request */
        ug_destroy_me(ad->ug);
        SETTING_TRACE_END;
-       return EINA_FALSE;
-
 }
 
 
@@ -793,7 +791,7 @@ static int setting_sound_main_create(void *cb)
                ad->ly_main = setting_create_win_layout(ad->win_get);
                ad->navi_bar = setting_create_navi_bar(ad->ly_main);
 
-               ADD_GENLIST(ad->gl_lite_main, ad->navi_bar);
+               __add_genlist(ad->gl_lite_main, ad->navi_bar);
 
                __get_lite_main_list(ad);
 
@@ -1143,8 +1141,15 @@ setting_sound_main_mouse_up_Gendial_list_cb(void *data,
                                             void *event_info)
 {
        /* error check */
-       ret_if(data == NULL);
-       retm_if(event_info == NULL, "Invalid argument: event info is NULL");
+       if(data == NULL) {
+               SETTING_TRACE_ERROR("data == NULL");
+               return;
+       }
+
+       if(event_info == NULL) {
+               SETTING_TRACE_ERROR("Invalid argument: event info is NULL");
+               return;
+       }
 
        Elm_Object_Item *item = (Elm_Object_Item *) event_info;
        elm_genlist_item_selected_set(item, 0);
@@ -1226,21 +1231,29 @@ setting_sound_main_mouse_up_Gendial_list_cb(void *data,
 
                int vconf_value = 0;
                Evas_Object *genlist = NULL;
-               ADD_GENLIST(genlist, ad->navi_bar);
+               __add_genlist(genlist, ad->navi_bar);
                /* 1. Touch sounds */
                if (vconf_get_bool(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, &vconf_value) < 0)
                        vconf_value = TRUE;     /*  default value of touch sounds : on */
-               ADD_TOGGLE_MENU(ad->data_touch_sounds, genlist, itc_1text_1icon, "IDS_ST_MBODY_TOUCH_SOUND", "IDS_ST_BODY_PLAY_A_SOUND_WHEN_BUTTONS_ICONS_AND_MENU_ITEMS_ARE_TAPPED", vconf_value, ad)
 
+               __add_toggle_menu(ad->data_touch_sounds, genlist,
+                                                       itc_1text_1icon, "IDS_ST_MBODY_TOUCH_SOUND",
+                                                       "IDS_ST_BODY_PLAY_A_SOUND_WHEN_BUTTONS_ICONS_AND_MENU_ITEMS_ARE_TAPPED",
+                                                       vconf_value, ad);
                /* 2. Keytones */
                if (vconf_get_bool(VCONFKEY_SETAPPL_BUTTON_SOUNDS_BOOL, &vconf_value) < 0)
                        vconf_value = TRUE;     /*  default value of touch sounds : on */
-               ADD_TOGGLE_MENU(ad->data_button_sounds, genlist, itc_1text_1icon, "IDS_ST_MBODY_DIALLING_KEYPAD_TONE", "IDS_ST_BODY_PLAY_TONE_WHEN_THE_DIALLING_KEYPAD_IS_TAPPED", vconf_value, ad)
-
+               __add_toggle_menu(ad->data_button_sounds, genlist, itc_1text_1icon,
+                                                       "IDS_ST_MBODY_DIALLING_KEYPAD_TONE",
+                                                       "IDS_ST_BODY_PLAY_TONE_WHEN_THE_DIALLING_KEYPAD_IS_TAPPED", vconf_value, ad);
                /*  3. Screen lock sound */
                if (vconf_get_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, &vconf_value) < 0)
                        vconf_value = 0;        /*  default value of lock/unlock sound : off */
-               ADD_TOGGLE_MENU(ad->data_lock_sound, genlist, itc_1text_1icon, "IDS_ST_BODY_SCREEN_LOCK_SOUND", "IDS_ST_BODY_PLAY_SOUNDS_WHEN_LOCKING_AND_UNLOCKING_SCREEN", vconf_value, ad)
+
+               __add_toggle_menu(ad->data_lock_sound, genlist, itc_1text_1icon,
+                                                       "IDS_ST_BODY_SCREEN_LOCK_SOUND",
+                                                       "IDS_ST_BODY_PLAY_SOUNDS_WHEN_LOCKING_AND_UNLOCKING_SCREEN",
+                                                       vconf_value, ad);
 
                Elm_Object_Item *navi_it = elm_naviframe_item_push(ad->navi_bar, "IDS_ST_HEADER_FEEDBACK", NULL, NULL, genlist, NULL);
                elm_object_item_domain_text_translatable_set(navi_it, SETTING_PACKAGE, EINA_TRUE);
index aaec10b7aa3102a6bcae64ad9df2eea24ed60e65..4b6b756b67f2f28904de240ad8ec1594cbb41e06 100644 (file)
@@ -35,7 +35,8 @@ static Evas_Object *vp_create_win(const char *name, bool transparent)
 {
        SETTING_TRACE_BEGIN;
        Evas_Object *eo;
-       int w, h;
+       int w = 0;
+       int h = 0;
 
        eo = elm_win_add(NULL, name, ELM_WIN_BASIC);
 
@@ -46,8 +47,8 @@ static Evas_Object *vp_create_win(const char *name, bool transparent)
                if (transparent) {
                        elm_win_alpha_set(eo, EINA_TRUE);
 
-                       unsigned int opaqueVal = 1;
 #ifdef ECORE_X
+                       unsigned int opaqueVal = 1;
                        Ecore_X_Atom opaqueAtom = ecore_x_atom_get("_E_ILLUME_WINDOW_REGION_OPAQUE");
                        Ecore_X_Window xwin = elm_win_xwindow_get(eo);
                        ecore_x_window_prop_card32_set(xwin, opaqueAtom, &opaqueVal, 1);
@@ -57,10 +58,10 @@ static Evas_Object *vp_create_win(const char *name, bool transparent)
                evas_object_smart_callback_add(eo, "delete,request", vp_del_win, NULL);
 #ifdef ECORE_X
                ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
+#else
+               elm_win_screen_size_get(eo, NULL, NULL, &w, &h);
 #endif
                evas_object_resize(eo, w, h);
-               /*elm_win_screen_size_get(eo, NULL, NULL, &w, &h); */
-               /*evas_object_resize(eo, 100, 100); */
 
                evas_object_show(eo);
                elm_win_activate(eo);
index 74bdbb507867ff37a1a81cd4a53c995ced3404c8..c15787668c23498405457284ac9e8c173237ff99 100644 (file)
@@ -176,8 +176,8 @@ static void ringtone_item_sel(void *data, Evas_Object *obj, void *event_info)
 
 static int _compare_cb(const void *d1, const void *d2)
 {
-       fileNodeInfo *pNode1 = d1;
-       fileNodeInfo *pNode2 = d2;
+       const fileNodeInfo *pNode1 = (const fileNodeInfo *)d1;
+       const fileNodeInfo *pNode2 = (const fileNodeInfo *)d2;
 
        return safeStrCmp(pNode1->media_name, pNode2->media_name);
 }
index a12a1ff65bb59887eca7aeea11d2ad329401c7d3..304166a4025e43120d96ff4eeb158db7a973aead 100644 (file)
@@ -25,7 +25,7 @@ inline char *strlower(char *str)
 {
        if (!str) return NULL;
        char *orig = str;
-       for (; *str != '\0 '; str++)
+       for (; *str != '\0'; str++)
                *str = tolower(*str);
        return orig;
 };
index 8956a242efb974b65cedd68eee5bf15f025ecf4b..50044f1dc46e8c0c6400e7ced02f6b969d241198 100644 (file)
@@ -309,39 +309,6 @@ int _handle_sim_exception(void *data, int sim_status)
        return SETTING_RETURN_SUCCESS;
 }
 
-static Eina_Bool __remove_sim_popup_cb(void *data)
-{
-       SETTING_TRACE_BEGIN;
-       retv_if(data == NULL, EINA_FALSE);
-       SettingSecurityUG *ad = (SettingSecurityUG *)data;
-
-       if (ad->sim_popup) {
-               evas_object_del(ad->sim_popup);
-               ad->sim_popup = NULL;
-       }
-       ad->remove_sim_popup_timer = NULL;
-       return EINA_FALSE;
-}
-
-static Eina_Bool _check_tapi_async_cb_is_called(void *data)
-{
-       SETTING_TRACE_BEGIN;
-       retv_if(data == NULL, EINA_FALSE);
-
-       SettingSecurityUG *ad = (SettingSecurityUG *)data;
-
-       if (!ad->enter_tapi_async_cb_flag) {
-               ad->sim_popup = setting_create_popup(ad, ad->win_get,
-                                                    NULL, KeyStr_Security_Waiting_Sim,
-                                                    (setting_call_back_func)__remove_sim_popup_cb,
-                                                    0, FALSE, FALSE, 0);
-               ad->remove_sim_popup_timer = ecore_timer_add(1, __remove_sim_popup_cb, ad);
-       }
-       ad->tapi_async_cb_check_timer = NULL;
-
-       return EINA_FALSE;
-}
-
 Eina_Bool __freeze_event_timer_cb(void *cb)
 {
        SETTING_TRACE_BEGIN;
@@ -406,18 +373,10 @@ setting_security_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
            (Setting_GenGroupItem_Data *) elm_object_item_data_get(item);
        setting_retm_if(NULL == list_item, "list_item is NULL");
 
-       SettingSecurityUG *ad = (SettingSecurityUG *) data;
-
        SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
 
        if (!safeStrCmp(KeyStr_LockScreen, list_item->keyStr)) {
-#if 0
-               int window_id = elm_win_xwindow_get(ad->win_get);
-               if (0 == app_launcher("lockscreen-options")) {
-                       ad->update_view_timer = ecore_timer_add(1, __freeze_event_timer_cb, ad);
-                       evas_object_freeze_events_set(ad->navi_bar, EINA_TRUE);
-               }
-#else
+
                retm_if(data == NULL, "Data parameter is NULL");
 
                SettingSecurityUG *ad = (SettingSecurityUG *) data;
@@ -434,7 +393,6 @@ setting_security_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
                SETTING_TRACE("To load ug[%s]", "lockscreen-options");
                setting_ug_create(ad->ug, "lockscreen-options", UG_MODE_FULLVIEW, NULL, cbs);
                FREE(cbs);
-#endif
        }
 }
 
index a09d1fa0d5016ad192a3dc4e3d61c0dabaa7114b..99d9bdebcf5e2b4aa10bd2e930e904220d32b825 100644 (file)
@@ -57,8 +57,12 @@ setting_view setting_view_security_update = {
  ****************************************************/
 static int setting_view_security_update_create(void *cb)
 {
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
        SETTING_TRACE_BEGIN;
+       if (!cb) {
+               SETTING_TRACE_ERROR("cb == NULL");
+               return SETTING_GENERAL_ERR_NULL_DATA_PARAMETER;
+       }
+
        SettingSecurityUG *ad = (SettingSecurityUG *) cb;
 
        Evas_Object *scroller;
@@ -126,7 +130,7 @@ static int setting_view_security_update_create(void *cb)
        } else {
                SETTING_TRACE_ERROR("ad->data_security_update_chk is NULL");
        }
-       ADD_GL_HELP(scroller, CHECK_UPDATE_AUTO_MSG);
+       setting_add_gl_help(scroller, CHECK_UPDATE_AUTO_MSG);
 
        /* separator */
        item = elm_genlist_item_append(scroller, &itc_seperator, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -147,7 +151,7 @@ static int setting_view_security_update_create(void *cb)
        } else {
                SETTING_TRACE_ERROR("ad->data_security_update_chk is NULL");
        }
-       ADD_GL_HELP(scroller, SECURITY_VIA_WIFI_HELP_MSG);
+       setting_add_gl_help(scroller, SECURITY_VIA_WIFI_HELP_MSG);
 
        /*get auto update & via wifi value */
        __get_toggle_status_form_msa(cb);
index 177e3f2fd24cedcd388364379258b7b5df249826..7fee74d7d226ed8f94e43a63fc5f798395fe6919 100644 (file)
@@ -284,8 +284,9 @@ int pwd_handler_sec_pw_pin1_blocked(SettingSecurityUG *data, void *arg)
        Ecore_X_Display *disp = NULL;
 #endif
 
-       int ret = 0;
+
 #ifdef ECORE_X
+       int ret = 0;
        disp = ecore_x_display_get();
        xwin = elm_win_xwindow_get(ad->win_get);
 
@@ -306,12 +307,12 @@ int pwd_handler_sec_pw_pin1_blocked(SettingSecurityUG *data, void *arg)
                SETTING_TRACE("eext_win_keygrab_set() failed.");
 #endif
 
+       /* set quickpanel disable */
+#ifdef ECORE_X
        unsigned int val[3];
        val[0] = 0;     /* always enable F */
        val[1] = 0;             /* quickpanel enable F */
        val[2] = 0;     /* apptray enable F */
-       /* set quickpanel disable */
-#ifdef ECORE_X
        Ecore_X_Atom ATOM_PANEL_SCROLLABLE_STATE = 0;
        ATOM_PANEL_SCROLLABLE_STATE = ecore_x_atom_get("_E_MOVE_PANEL_SCROLLABLE_STATE");
        ecore_x_window_prop_card32_set(xwin, ATOM_PANEL_SCROLLABLE_STATE, val, 3);
@@ -532,7 +533,6 @@ static void setting_security_ug_on_pause(ui_gadget_h ug, app_control_h service,
 {
        SETTING_TRACE_BEGIN;
        setting_retm_if((!priv), "!priv");
-       SettingSecurityUG *securityUG = priv;
 
        if (setting_view_security_sim_settings.is_create == TRUE) {
                bool is_running = FALSE;
@@ -542,6 +542,7 @@ static void setting_security_ug_on_pause(ui_gadget_h ug, app_control_h service,
 #ifdef ECORE_X
                        Ecore_X_Window xwin = 0;
                        Ecore_X_Display *disp = NULL;
+                       SettingSecurityUG *securityUG = priv;
 
                        disp = ecore_x_display_get();
                        xwin = elm_win_xwindow_get(securityUG->win_get);
@@ -562,12 +563,12 @@ static void setting_security_ug_on_pause(ui_gadget_h ug, app_control_h service,
                                SETTING_TRACE("eext_win_keygrab_unset() failed.");
 #endif
 
+#ifdef ECORE_X
                        unsigned int val[3];
                        val[0] = 1;     /* always enable */
                        val[1] = 1;             /* quickpanel enable */
                        val[2] = 1;     /* apptray enable */
                        /* set quickpanel enable */
-#ifdef ECORE_X
                        Ecore_X_Atom ATOM_PANEL_SCROLLABLE_STATE = 0;
                        ATOM_PANEL_SCROLLABLE_STATE = ecore_x_atom_get("_E_MOVE_PANEL_SCROLLABLE_STATE");
                        ecore_x_window_prop_card32_set(xwin, ATOM_PANEL_SCROLLABLE_STATE, val, 3);
index 8f67fc84e6e8be930f96d727cc038792cfe651e5..56bfe3de5abfb5363abdafe87a8b01379e2c0852 100644 (file)
@@ -454,7 +454,6 @@ static inline void storageUg_SD_remove_info(SettingStorageUG *ad)
 
 void storageUg_main_append_SD_info(SettingStorageUG *ad)
 {
-       char *str;
        int mmc_mode;
 
        ret_if(ad == NULL);
@@ -478,7 +477,7 @@ void storageUg_main_append_SD_info(SettingStorageUG *ad)
                SETTING_TRACE_ERROR("mmc_mode(%d) Invalid", mmc_mode);
 
 #if 0
-       str = vconf_get_str(storageUg_ENCRYPT_stat);
+       char *str = vconf_get_str(storageUg_ENCRYPT_stat);
        warn_if(NULL == str, "vconf_get_str(%s) Fail", storageUg_ENCRYPT_stat);
        if (!safeStrCmp(str, "encryption_start") || !safeStrCmp(str, "decryption_start")) {
                if (ad->sd_mount) setting_disable_genlist_item(ad->sd_mount->item);
index d3ffc8bd06290b9df17fcf8d74d24f9ea5ca69cf..cd246d4df326401c2b215cdc904f06fc8dc09fc6 100644 (file)
@@ -384,7 +384,7 @@ static int storageUg_default_create(void *data)
                SETTING_TRACE_ERROR("ad->data_installapp is NULL");
        }
 
-       ADD_GL_HELP(genlist, STORAGEUG_STR_APP_LOC_NOTICE);
+       setting_add_gl_help(genlist, STORAGEUG_STR_APP_LOC_NOTICE);
 
        ret = vconf_notify_key_changed(storageUg_MMC_stat, storageUg_default_mmc_changed_cb,
                                       ad);
index 643dc040e446fb1fa04679c87f42488f2d4656aa..ca437289de6eb450cef60cb5d67f2844ce54ae07 100644 (file)
@@ -224,7 +224,6 @@ static inline void storageUg_main_part_pie_graph_set(Evas_Object *parent,
 Evas_Object *storageUg_main_pie_item_get_icon(void *data, Evas_Object *obj,
                                                                                          const char *part)
 {
-       int layout_w, layout_h;
        double used_size;
        Evas_Object *layout;
        SettingStorageUG *ad = data;
@@ -235,9 +234,6 @@ Evas_Object *storageUg_main_pie_item_get_icon(void *data, Evas_Object *obj,
        retv_if(NULL == data, NULL);
        retvm_if(safeStrCmp(part, "elm.icon"), NULL, "part(%s) Invaild", part);
 
-       layout_w = SETTING_STORAGE_PIE_RECT_WIDTH;
-       layout_h = SETTING_STORAGE_PIE_RECT_HEIGHT;
-
        layout = elm_layout_add(obj);
        elm_layout_file_set(layout, SETTING_THEME_EDJ_NAME, "storage_pie");
 
@@ -260,7 +256,6 @@ Evas_Object *storageUg_main_pie_item_get_icon(void *data, Evas_Object *obj,
 
        /*pie */
        storageUg_main_part_pie_graph_set(layout, "pie_rect", ad);
-       /*setting_resize_object(layout, layout_w, layout_h); */
        evas_object_show(layout);
 
        return layout;
index 932df8b2dc7ce5840298855658e217b3322bb6d7..ced30b68ad19c56447faf1adb2b77b034f40011d 100644 (file)
@@ -96,14 +96,6 @@ more_ctxpopup_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
        evas_object_event_callback_del_full(nf, EVAS_CALLBACK_RESIZE, naviframe_resize_cb, ctxpopup);
 }
 
-static void
-win_rotation_changed_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       Evas_Object *ctxpopup = data;
-       move_more_ctxpopup(ctxpopup);
-}
-
 //static inline void storageUg_misces_gl_remove_select_all_item(SettingStorageUG *ad);
 static void _genlist_check_hide(SettingStorageUG *ad, bool hide)
 {
@@ -178,10 +170,7 @@ static void create_ctxpopup_more_button_cb(void *data, Evas_Object *obj, void *e
 {
        SETTING_TRACE_BEGIN;
        SettingStorageUG  *ad = (SettingStorageUG*) data;
-       Evas_Object *it_obj;
        Evas_Object *nf = ad->navi;
-       Evas_Object *win;
-       Elm_Object_Item *it;
 
        if (ctxpopup != NULL) {
                evas_object_del(ctxpopup);
@@ -196,17 +185,10 @@ static void create_ctxpopup_more_button_cb(void *data, Evas_Object *obj, void *e
        evas_object_event_callback_add(ctxpopup, EVAS_CALLBACK_DEL, more_ctxpopup_del_cb, nf);
        evas_object_event_callback_add(nf, EVAS_CALLBACK_RESIZE, naviframe_resize_cb, ctxpopup);
 
-       /* We convince the top widget is a window */
-//     win = elm_object_top_widget_get(nf);
-//     evas_object_smart_callback_add(win, "rotation,changed", win_rotation_changed_cb, ctxpopup);
-
        //---------------------------------------------------------------------------------------------
        elm_ctxpopup_item_append(ctxpopup, _("IDS_ST_BODY_DELETE"), NULL, setting_storage_ctx_click_softkey_cb, ad);
        //---------------------------------------------------------------------------------------------
 
-
-
-
        elm_ctxpopup_direction_priority_set(ctxpopup, ELM_CTXPOPUP_DIRECTION_UP, ELM_CTXPOPUP_DIRECTION_UNKNOWN, ELM_CTXPOPUP_DIRECTION_UNKNOWN, ELM_CTXPOPUP_DIRECTION_UNKNOWN);
        move_more_ctxpopup(ctxpopup);
        evas_object_show(ctxpopup);
@@ -1041,25 +1023,12 @@ storageUg_misces_cancel_cb(void *data, Evas_Object *obj, void *event_info)
        SETTING_TRACE_END;
 }
 
-static void
-setting_storage_click_softkey_delete_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-
-       SettingStorageUG *ad = (SettingStorageUG *) data;
-
-       return;
-}
-
 //--------------------------------------------------
 //     name: "storageview_layout";
 //--------------------------------------------------
 static int storageUg_misces_create(void *data)
 {
        SettingStorageUG *ad = data;
-       Evas_Object *sel_all = NULL;
 
        retv_if(data == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
index 87ade330b4fe46626ffd4368fdb105c8263de885..638d1e0259a2373c255cc2a9e567d8724c791f13 100644 (file)
@@ -437,7 +437,7 @@ void storageUG_update_apps_info(SettingStorageUG *ad)
                return;
        }
 
-       ret = pkgmgr_client_get_size(ad->pc, "get", PM_GET_ALL_PKGS, storageUg_get_apps_info,
+       ret = pkgmgr_client_get_size(ad->pc, "get", PM_GET_ALL_PKGS, (pkgmgr_handler)storageUg_get_apps_info,
                                     ad);
        warn_if(ret, "pkgmgr_client_get_size() Fail(%d)", ret);
 }
index 84cdf8475be42e8f14d9b8beaefbeb0858bc6528..7f18d14eb0e3712ab26e716e980c9a4801ae9f5c 100644 (file)
@@ -369,7 +369,6 @@ static void setting_storageUg_on_key_event(ui_gadget_h ug,
 static void setting_storageUg_on_start(ui_gadget_h ug, app_control_h app_control, void *priv)
 {
        SETTING_TRACE_BEGIN;
-       SettingStorageUG *storageUG = priv;
 
        retm_if(NULL == ug || NULL == priv, "ug=%p, priv=%p is Invalid", ug, priv);
 
index 00fb4384dd21b168a40dc5961e218f6da4419380..9b6bdeca59f81e235fdfa0c477fda67279dd8d64 100644 (file)
@@ -233,8 +233,7 @@ static void setting_time_main_int_vconf_change_cb(keynode_t *key, void *data)
                setting_retm_if(NULL == pa_time_format, "pa_time_format is NULL");
 
                char* lang = NULL;
-               int err = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &lang);
-               char *date = __setting_phone_lang_get_by_pattern(lang, "MMM/d/yyyy");
+               system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &lang);
 
                if (!strncmp(pa_time_format, "IDS_ST_BODY_12_HOURS", strlen("IDS_ST_BODY_12_HOURS")))
                        time = __setting_phone_lang_get_by_pattern(lang, "hhmm");
@@ -270,7 +269,7 @@ static int _alarmmgr_set_systime_helper(time_t t_current)
                /* set event system */
                setting_set_event_system(SYS_EVENT_SCREEN_AUTOROTATE_STATE,
                                         EVT_KEY_TIME_CHANGED,
-                                        t_current);
+                                        ctime(&t_current));
        }
 
        return ret;
@@ -528,18 +527,16 @@ static void setting_time_main_datefield_set_cb(void *data, Evas_Object *object,
        int ret = _alarmmgr_set_systime_helper(the_time);
 
 #ifdef USE_TIMER_UPDATE_TIME_IN_TIME_VIEW
-       if (ad->update_timer) {
-               ecore_timer_thaw(ad->update_timer);
-       }
+if (ad->update_timer) {
+       ecore_timer_thaw(ad->update_timer);
+}
 #endif
 
-#if 1
-       time_t cctime = time(NULL);
        struct tm ts_ret;
-       struct tm *ts = localtime_r(&cctime, &ts_ret);
+
        SETTING_TRACE("After _alarmmgr_set_systime_helper() ....year : %d, month : %d, day : %d, hour : %d, min : %d",
                      ts_ret.tm_year, ts_ret.tm_mon, ts_ret.tm_mday, ts_ret.tm_hour, ts_ret.tm_min);
-#endif
+
        Evas_Object *popup = NULL;
        popup = evas_object_data_get(obj, "popup");
        if (popup) {
@@ -552,11 +549,11 @@ static void setting_time_main_datefield_set_cb(void *data, Evas_Object *object,
 #ifdef USE_TIMER_UPDATE_TIME_IN_TIME_VIEW
 Eina_Bool __refresh_date_timer(void *data)
 {
-       SETTING_TRACE_BEGIN;
-       SettingTimeUG *ad = data;
+       SETTING_TRACE_BEGIN;
+       SettingTimeUG *ad = data;
 
-       __setting_update_datefield_cb(ad);
-       return 1;
+       __setting_update_datefield_cb(ad);
+       return 1;
 }
 #endif
 
@@ -569,7 +566,7 @@ void hour_format_event_handler(const char *event_name, bundle *data, void *user_
        SETTING_TRACE("hour_format_set(%s)", hour_format_set);
 }
 
-int hour_format_event_reg_id;
+unsigned int hour_format_event_reg_id;
 
 static int setting_time_main_create(void *cb)
 {
@@ -777,7 +774,8 @@ static int setting_time_main_create(void *cb)
        } else {
                SETTING_TRACE_ERROR("ad->data_time_fmt is NULL");
        }
-       ADD_GL_HELP_NO_SEP(scroller, "IDS_ST_SBODY_SHOW_THE_TIME_IN_24_HOUR_FORMAT_INSTEAD_OF_12_HOUR_HAM_PM_FORMAT");
+
+       setting_add_gl_help(scroller, "IDS_ST_SBODY_SHOW_THE_TIME_IN_24_HOUR_FORMAT_INSTEAD_OF_12_HOUR_HAM_PM_FORMAT");
 
 #if APPLIED_DATATIME_DATA_FORMAT
        char *pa_date_format = get_pa_date_format_str();
@@ -1112,7 +1110,12 @@ void setting_time_main_launch_worldclock_sg(void *data)
 static void __setting_update_datefield_cb(void *cb)
 {
        SETTING_TRACE_BEGIN;
-       retvm_if(cb == NULL, EINA_FALSE, "Data parameter is NULL");
+
+       if(!cb) {
+               SETTING_TRACE_ERROR("Data parameter is NULL");
+               return;
+       }
+
        SettingTimeUG *ad = (SettingTimeUG *) cb;
 
        if (ad->data_time) {
@@ -1122,14 +1125,18 @@ static void __setting_update_datefield_cb(void *cb)
                SETTING_TRACE("year : %d, month : %d, day : %d, hour : %d, min : %d",
                              ts_ret.tm_year, ts_ret.tm_mon, ts_ret.tm_mday, ts_ret.tm_hour, ts_ret.tm_min);
                if (ts) {
-
                        char* region = NULL;
-                       int err = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &region );
+                       system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &region );
                        char *date = __setting_phone_lang_get_by_pattern(region, "MMM/d/yyyy");
                        char *time;
                        static char date_arr[DEF_BUF_SIZE], time_arr[DEF_BUF_SIZE];
                        char *pa_time_format = get_pa_time_format_str();
-                       setting_retvm_if(NULL == pa_time_format, FALSE, "pa_time_format is NULL");
+
+                       if(NULL == pa_time_format) {
+                               SETTING_TRACE_ERROR("pa_time_format is NULL");
+                               return;
+                       }
+
                        if (!strncmp(pa_time_format, "IDS_ST_BODY_12_HOURS", strlen("IDS_ST_BODY_12_HOURS")))
                                time = __setting_phone_lang_get_by_pattern(region, "hhmm");
                        else
@@ -1284,7 +1291,12 @@ setting_time_main_chk_btn_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
+
+       if(!data) {
+               SETTING_TRACE_ERROR("Data parameter is NULL");
+               return;
+       }
+
        SettingTimeUG *ad = NULL;
        Setting_GenGroupItem_Data *list_item =
            (Setting_GenGroupItem_Data *) data;
@@ -1322,8 +1334,6 @@ setting_time_main_chk_btn_cb(void *data, Evas_Object *obj, void *event_info)
 #if FUNCTION_SYSTEM_SETTING
        /* Time format */
        if (ad->data_time_fmt == list_item) {
-               int err = 0;
-               int value = VCONFKEY_TIME_FORMAT_12;
                if (list_item->chk_status) {
                        err = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, true);
                } else {