Remove setting_set_event_system() call

- remove deprecated api call and SETTING_SYSTEM_SETTING definition (always 1)

Change-Id: I6333501f88024ac3b80e449bbcce8eab9c7778c8
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

diff --git a/include/setting-debug.h b/include/setting-debug.h
index 25504721d0da2754ca5b9578e45a07e57fd43a1b..b144934593df34de469722c9c8ed550223e87a83 100644 (file)
--- a/include/setting-debug.h
+++ b/include/setting-debug.h
@@ -71,7 +71,6 @@
 
 /* Genlist Update is in progress. */
 
-#define FUNCTION_SYSTEM_SETTING 1
 #define SETTING_SEARCH 1
 
 /*##menu options##*/

diff --git a/setting-common/include/setting-common-general-func.h b/setting-common/include/setting-common-general-func.h
index 4cc771d2f9425a5564e63bb4305c3d069fe0b423..0deab60e5d23b29b57351d98acc0fbd28541af2c 100644 (file)
--- a/setting-common/include/setting-common-general-func.h
+++ b/setting-common/include/setting-common-general-func.h
@@ -62,8 +62,6 @@
 
 #define sncat(to, size, from) strncat(to, from, size-strlen(to)-1)
 
-void setting_set_event_system(const char *sys_evt, const char *evt_key, const char *evt_val);
-
 extern char *setting_file_basename(char *path);
 extern int setting_file_attr_is_valid_name(const char *filename);
 

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index 537b9f0b589c13c5333978807f9ff6e82e9913a4..ff44020bdab572cad01c0496b5622266dfc5666c 100644 (file)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -48,19 +48,6 @@
 #include <eventsystem.h>
 #include <app_control_internal.h>
 
-EXPORT_PUBLIC
-void setting_set_event_system(const char *sys_evt, const char *evt_key, const char *evt_val)
-{
-       bundle *b = NULL;
-
-       SETTING_TRACE("sys_evt: %s, evt_key: %s, evt_val: %s", sys_evt, evt_key, evt_val);
-
-       b = bundle_create();
-       bundle_add_str(b, evt_key, evt_val);
-       eventsystem_request_sending_system_event(sys_evt, b);
-       bundle_free(b);
-}
-
 EXPORT_PUBLIC
 char *setting_file_basename(char *path)
 {

diff --git a/setting-network/src/setting-network.c b/setting-network/src/setting-network.c
index 569484428bb1bd2f89656379b0708c50e3054f2a..caecf3e98926024d371665b7351a36a77b731841 100644 (file)
--- a/setting-network/src/setting-network.c
+++ b/setting-network/src/setting-network.c
@@ -1990,10 +1990,8 @@ void setting_network_set_state_data_roaming(ButtonState state)
        int err;
        if (state == SETTING_ON_OFF_BTN_ON) {
                setting_set_bool_slp_key(BOOL_SLP_SETTING_DATA_ROAMING, SETTING_ON_OFF_BTN_ON, &err);
-               /*              setting_set_event_system(SYS_EVENT_DATA_ROAMING_STATE, EVT_KEY_DATA_ROAMING_STATE, EVT_VAL_DATA_ROAMING_ON); */
        } else {
                setting_set_bool_slp_key(BOOL_SLP_SETTING_DATA_ROAMING, SETTING_ON_OFF_BTN_OFF, &err);
-               /*              setting_set_event_system(SYS_EVENT_DATA_ROAMING_STATE, EVT_KEY_DATA_ROAMING_STATE, EVT_VAL_DATA_ROAMING_OFF); */
        }
 }
 

diff --git a/setting-phone/src/setting-phone.c b/setting-phone/src/setting-phone.c
index 0fab560e09d6c200d07ed3b844819f86059ba189..c8be3e5e2863e41dc5ea3999a25488607f91e86f 100644 (file)
--- a/setting-phone/src/setting-phone.c
+++ b/setting-phone/src/setting-phone.c
@@ -876,31 +876,13 @@ UG_MODULE_API int setting_plugin_search_init(app_control_h service, void *priv,
 
 int set_language_helper(const char *lang)
 {
-#if 0
-       int ret = vconf_set_str(VCONFKEY_LANGSET, lang);
-       if (ret == 0) {
-               /* on success */
-               /* set event system */
-               setting_set_event_system(SYS_EVENT_LANGUAGE_SET, EVT_KEY_LANGUAGE_SET, lang);
-       }
-#else
        int ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, lang);
-#endif
        return ret;
 }
 
 int set_regionformat_helper(const char *region)
 {
-
-#if 0
-       int ret = vconf_set_str(VCONFKEY_REGIONFORMAT, region);
-       if (ret == 0) {
-               /* set event system */
-               setting_set_event_system(SYS_EVENT_REGION_FORMAT, EVT_KEY_REGION_FORMAT, region);
-       }
-#else
        int ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, region);
-#endif
        return ret;
 }
 

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index 28e516629b1c23a9ee076aaea2a9598695e4d33f..bdd0b5e375baee172459fbb7c9dcb1904143f26b 100644 (file)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -318,7 +318,6 @@ static void __call_slider_change_cb(
                                list_item->chk_status,
                                val);
 
-#if FUNCTION_SYSTEM_SETTING
                if (list_item->chk_status == 0) {
                        /* change to Vibration mode */
                        /* call system_setting */
@@ -342,32 +341,6 @@ static void __call_slider_change_cb(
                                                FALSE);
                        }
                }
-#else
-               if (list_item->chk_status == 0) {
-                       /* change to Vibration mode */
-                       vconf_set_bool(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL,
-                                       FALSE);
-                       vconf_set_bool(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL,
-                                       TRUE);
-                       setting_set_event_system(
-                                       SYS_EVENT_SILENT_MODE,
-                                       EVT_KEY_SILENT_MODE,
-                                       EVT_VAL_SILENTMODE_OFF);
-                       /*insert log for vibrate mode on state */
-               } else {
-                       if (!ad->sound_on) {
-                               vconf_set_bool(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL,
-                                               TRUE);
-                               vconf_set_bool(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL,
-                                               FALSE);
-                               setting_set_event_system(
-                                               SYS_EVENT_SILENT_MODE,
-                                               EVT_KEY_SILENT_MODE,
-                                               EVT_VAL_SILENTMODE_OFF);
-                               /*insert log for sound mode on state */
-                       }
-               }
-#endif
 
                setting_sound_update_slider_icon(list_item, SND_SLIDER_CALL);
 

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index 3fc0083b0d2017e878e32d1de958ff77d494d34a..6383878c8a657a879084eecec7de039780385151 100644 (file)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -267,27 +267,18 @@ static void setting_time_main_int_vconf_change_cb(keynode_t *key, void *data)
 
 static int _alarmmgr_set_timezone_helper(char *tzdata)
 {
+       SETTING_TRACE_BEGIN;
+       
        int ret = alarmmgr_set_timezone(tzdata);
-       if (ret) {
-               /* set event system */
-               setting_set_event_system(SYS_EVENT_TIME_ZONE,
-                               EVT_KEY_TIME_ZONE,
-                               tzdata);
-       }
 
        return ret;
 }
 
 static int _alarmmgr_set_systime_helper(time_t t_current)
 {
-       int ret;
-       ret = alarmmgr_set_systime(t_current);
-       if (ret) {
-               /* set event system */
-               setting_set_event_system(SYS_EVENT_SCREEN_AUTOROTATE_STATE,
-                               EVT_KEY_TIME_CHANGED,
-                               ctime(&t_current));
-       }
+       SETTING_TRACE_BEGIN;
+
+       int ret = alarmmgr_set_systime(t_current);
 
        return ret;
 }
@@ -570,7 +561,8 @@ static void setting_time_main_datefield_set_cb(void *data, Evas_Object *object,
 
        /* invoke API to change time */
        int ret = _alarmmgr_set_systime_helper(the_time);
-
+       setting_retm_if(ret == -1, "_alarmmgr_set_systime_helper call failed");
+       
 #ifdef USE_TIMER_UPDATE_TIME_IN_TIME_VIEW
        if (ad->update_timer) {
                ecore_timer_thaw(ad->update_timer);
@@ -592,7 +584,6 @@ static void setting_time_main_datefield_set_cb(void *data, Evas_Object *object,
                evas_object_del(popup);
                popup = NULL;
        }
-       setting_retm_if(ret == -1, "_alarmmgr_set_systime_helper call failed");
 }
 
 #ifdef USE_TIMER_UPDATE_TIME_IN_TIME_VIEW
@@ -1418,8 +1409,6 @@ setting_time_main_chk_btn_cb(void *data, Evas_Object *obj, void *event_info)
 
 
 
-       /*#define FUNCTION_SYSTEM_SETTING 1 */
-#if FUNCTION_SYSTEM_SETTING
        /* Time format */
        if (ad->data_time_fmt == list_item) {
                if (list_item->chk_status) {
@@ -1444,25 +1433,7 @@ setting_time_main_chk_btn_cb(void *data, Evas_Object *obj, void *event_info)
                        }
                }
        }
-#else
-       /* Time format */
-       if (ad->data_time_fmt == list_item) {
-               int err = 0;
-               int value = VCONFKEY_TIME_FORMAT_12;
-               if (list_item->chk_status) {
-                       value = VCONFKEY_TIME_FORMAT_24;
-                       setting_set_event_system(SYS_EVENT_HOUR_FORMAT,
-                                       EVT_KEY_HOUR_FORMAT,
-                                       EVT_VAL_HOURFORMAT_24);
-               } else {
-                       setting_set_event_system(SYS_EVENT_HOUR_FORMAT,
-                                       EVT_KEY_HOUR_FORMAT,
-                                       EVT_VAL_HOURFORMAT_12);
-               }
-               setting_set_int_slp_key(INT_SLP_SETTING_REGIONFORMAT_TIME1224,
-                               value, &err);
-       }
-#endif
+
        SETTING_TRACE_END;
 }