Revise vconf callback slots

Change-Id: Ic353768260354e056d6aab23845cd9a39ad79804
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/include/system_settings_private.h b/include/system_settings_private.h
index b61c0ca..57f3406 100644 (file)
--- a/include/system_settings_private.h
+++ b/include/system_settings_private.h
@@ -102,17 +102,18 @@ system_setting_data_type_e;
 
 /**
  * @internal
- * @since_tizen 4.0
- * Enumeration for supported profile info
+ * @since_tizen 6.0
+ * Enumeration for callback slot
  */
 typedef enum {
-       SYSTEM_SETTING_SUPPORTED_PROFILE_MOBILE = 0x1,          /**< mobile */
-       SYSTEM_SETTING_SUPPORTED_PROFILE_WEARABLE = 0x2,        /**< wearable */
-       SYSTEM_SETTING_SUPPORTED_PROFILE_TV = 0x4,                      /**< tv */
-       SYSTEM_SETTING_SUPPORTED_PROFILE_COMMON = 0x8,          /**< common*/
-       SYSTEM_SETTING_SUPPORTED_PROFILE_ALL = 0xF,                     /**< all of profiles */
+       SYSTEM_SETTING_CALLBACK_SLOT_0 = 0,
+       SYSTEM_SETTING_CALLBACK_SLOT_1 = 1,
+       SYSTEM_SETTING_CALLBACK_SLOT_2 = 2,
+       SYSTEM_SETTING_CALLBACK_SLOT_3 = 3,
+       SYSTEM_SETTING_CALLBACK_SLOT_4 = 4,
+       SYSTEM_SETTING_CALLBACK_SLOT_5 = 5
 }
-system_setting_supported_profile_info_e;
+system_setting_callback_slot_e;
 
 /**
  * @internal
@@ -296,27 +297,27 @@ int system_setting_vconf_set_value_string(const char *vconf_key, char *value);
  * @since_tizen 2.3
  * @param[in] vconf_key
  * @param[in] key
- * @param[in] slot internal slot to set the key (0~4)
+ * @param[in] slot internal slot to set the key (0~5)
  * @param[in] user_data user data
  * @return     0 on success, otherwise a negative error value
  * @retval     #SYSTEM_SETTINGS_ERROR_NONE Successful
  * @retval     #SYSTEM_SETTINGS_ERROR_IO_ERROR Internal I/O error
  * @retval     #SYSTEM_SETTINGS_ERROR_PERMISSION_DENIED Permission violation error
  */
-int system_setting_vconf_set_changed_cb(const char *vconf_key, system_settings_key_e key, int slot, void *user_data);
+int system_setting_vconf_set_changed_cb(const char *vconf_key, system_settings_key_e key, system_setting_callback_slot_e slot, void *user_data);
 
 /**
  * @internal
  * @brief Unset the system settings notification callback
  * @since_tizen 2.3
  * @param[in] vconf_key vconf key name used in the code
- * @param[in] slot internal slot to set the key (0~4)
+ * @param[in] slot internal slot to set the key (0~5)
  * @return     0 on success, otherwise a negative error value
  * @retval     #SYSTEM_SETTINGS_ERROR_NONE Successful
  * @retval     #SYSTEM_SETTINGS_ERROR_IO_ERROR Internal I/O error
  * @retval     #SYSTEM_SETTINGS_ERROR_PERMISSION_DENIED Permission violation error
  */
-int system_setting_vconf_unset_changed_cb(const char *vconf_key, int slot);
+int system_setting_vconf_unset_changed_cb(const char *vconf_key, system_setting_callback_slot_e slot);
 
 /**
  * @internal

diff --git a/src/system_setting_platform.c b/src/system_setting_platform.c
index b97a2a3..aded30a 100644 (file)
--- a/src/system_setting_platform.c
+++ b/src/system_setting_platform.c
@@ -1240,97 +1240,97 @@ int system_setting_set_lockscreen_app(system_settings_key_e key, void *value)
 int system_setting_set_changed_callback_incoming_call_ringtone(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, 0, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, SYSTEM_SETTING_CALLBACK_SLOT_0, user_data);
 }
 
 int system_setting_unset_changed_callback_incoming_call_ringtone(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, 0);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, SYSTEM_SETTING_CALLBACK_SLOT_0);
 }
 
 int system_setting_set_changed_callback_email_alert_ringtone(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, SYSTEM_SETTINGS_KEY_EMAIL_ALERT_RINGTONE, 0, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, SYSTEM_SETTINGS_KEY_EMAIL_ALERT_RINGTONE, SYSTEM_SETTING_CALLBACK_SLOT_0, user_data);
 }
 
 int system_setting_unset_changed_callback_email_alert_ringtone(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, 0);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, SYSTEM_SETTING_CALLBACK_SLOT_0);
 }
 
 int system_setting_set_changed_callback_wallpaper_home_screen(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_BGSET, SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN, 0, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_BGSET, SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN, SYSTEM_SETTING_CALLBACK_SLOT_0, user_data);
 }
 
 int system_setting_unset_changed_callback_wallpaper_home_screen(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_BGSET, 0);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_BGSET, SYSTEM_SETTING_CALLBACK_SLOT_0);
 }
 
 int system_setting_set_changed_callback_wallpaper_lock_screen(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_IDLE_LOCK_BGSET, SYSTEM_SETTINGS_KEY_WALLPAPER_LOCK_SCREEN, 0, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_IDLE_LOCK_BGSET, SYSTEM_SETTINGS_KEY_WALLPAPER_LOCK_SCREEN, SYSTEM_SETTING_CALLBACK_SLOT_0, user_data);
 }
 
 int system_setting_unset_changed_callback_wallpaper_lock_screen(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_IDLE_LOCK_BGSET, 0);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_IDLE_LOCK_BGSET, SYSTEM_SETTING_CALLBACK_SLOT_0);
 }
 
 int system_setting_set_changed_callback_font_size(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, SYSTEM_SETTINGS_KEY_FONT_SIZE, 1, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, SYSTEM_SETTINGS_KEY_FONT_SIZE, SYSTEM_SETTING_CALLBACK_SLOT_1, user_data);
 }
 
 int system_setting_unset_changed_callback_font_size(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, 1);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, SYSTEM_SETTING_CALLBACK_SLOT_1);
 }
 
 int system_setting_set_changed_callback_usb_debugging_option(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL, SYSTEM_SETTINGS_KEY_USB_DEBUGGING_ENABLED, 1, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL, SYSTEM_SETTINGS_KEY_USB_DEBUGGING_ENABLED, SYSTEM_SETTING_CALLBACK_SLOT_1, user_data);
 }
 
 int system_setting_unset_changed_callback_usb_debugging_option(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL, 1);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_USB_DEBUG_MODE_BOOL, SYSTEM_SETTING_CALLBACK_SLOT_1);
 }
 
 int system_setting_set_changed_callback_3g_data_network(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_3G_ENABLE, SYSTEM_SETTINGS_KEY_3G_DATA_NETWORK_ENABLED, 1, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_3G_ENABLE, SYSTEM_SETTINGS_KEY_3G_DATA_NETWORK_ENABLED, SYSTEM_SETTING_CALLBACK_SLOT_1, user_data);
 }
 
 int system_setting_unset_changed_callback_3g_data_network(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_3G_ENABLE, 1);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_3G_ENABLE, SYSTEM_SETTING_CALLBACK_SLOT_1);
 }
 
 int system_setting_set_changed_callback_lockscreen_app(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR, SYSTEM_SETTINGS_KEY_LOCKSCREEN_APP, 1, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR, SYSTEM_SETTINGS_KEY_LOCKSCREEN_APP, SYSTEM_SETTING_CALLBACK_SLOT_1, user_data);
 }
 
 int system_setting_unset_changed_callback_lockscreen_app(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR, 1);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR, SYSTEM_SETTING_CALLBACK_SLOT_1);
 }
 
 
@@ -1340,26 +1340,26 @@ int system_setting_unset_changed_callback_lockscreen_app(system_settings_key_e k
 int system_setting_set_changed_callback_font_type(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, SYSTEM_SETTINGS_KEY_FONT_TYPE, 2, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, SYSTEM_SETTINGS_KEY_FONT_TYPE, SYSTEM_SETTING_CALLBACK_SLOT_2, user_data);
 }
 
 int system_setting_unset_changed_callback_font_type(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, 2);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, SYSTEM_SETTING_CALLBACK_SLOT_2);
 }
 
 /* TODO : 2th argument, callback, is not in use. */
 int system_setting_set_changed_callback_motion_activation(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_MOTION_ACTIVATION, SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, 3, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_MOTION_ACTIVATION, SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, SYSTEM_SETTING_CALLBACK_SLOT_3, user_data);
 }
 
 int system_setting_unset_changed_callback_motion_activation(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_MOTION_ACTIVATION, 3);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_MOTION_ACTIVATION, SYSTEM_SETTING_CALLBACK_SLOT_3);
 }
 
 /*//////////////////////////////////////////////////////////////////////////////////////// */
@@ -1406,13 +1406,13 @@ int system_setting_set_locale_country(system_settings_key_e key, void *value)
 int system_setting_set_changed_callback_locale_country(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_REGIONFORMAT, SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, 3, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_REGIONFORMAT, SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, SYSTEM_SETTING_CALLBACK_SLOT_3, user_data);
 }
 
 int system_setting_unset_changed_callback_locale_country(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_REGIONFORMAT, 3);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_REGIONFORMAT, SYSTEM_SETTING_CALLBACK_SLOT_3);
 }
 
 
@@ -1459,13 +1459,13 @@ int system_setting_set_changed_callback_locale_language(system_settings_key_e ke
 {
        SETTING_TRACE_BEGIN;
        /*return system_setting_vconf_set_changed_cb(VCONFKEY_LANGSET, SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, 3, user_data ); */
-       return system_setting_vconf_set_changed_cb(VCONFKEY_LANGSET, SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, 100, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_LANGSET, SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, SYSTEM_SETTING_CALLBACK_SLOT_5, user_data);
 }
 
 int system_setting_unset_changed_callback_locale_language(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_LANGSET, 100);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_LANGSET, SYSTEM_SETTING_CALLBACK_SLOT_5);
 }
 
 /*--------------------------------------- */
@@ -1516,13 +1516,13 @@ int system_setting_set_locale_timeformat_24hour(system_settings_key_e key, void
 int system_setting_set_changed_callback_locale_timeformat_24hour(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_REGIONFORMAT_TIME1224, SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, 3, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_REGIONFORMAT_TIME1224, SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, SYSTEM_SETTING_CALLBACK_SLOT_3, user_data);
 }
 
 int system_setting_unset_changed_callback_locale_timeformat_24hour(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_REGIONFORMAT_TIME1224, 3);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_REGIONFORMAT_TIME1224, SYSTEM_SETTING_CALLBACK_SLOT_3);
 }
 
 int system_setting_get_locale_timezone(system_settings_key_e key, void **value)
@@ -1569,14 +1569,14 @@ int system_setting_set_locale_timezone(system_settings_key_e key, void *value)
 /*  LCOV_EXCL_START */
 int system_setting_set_changed_callback_locale_timezone(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_TIMEZONE_ID, SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE, 4, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_TIMEZONE_ID, SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE, SYSTEM_SETTING_CALLBACK_SLOT_4, user_data);
 }
 /*  LCOV_EXCL_STOP */
 
 /*  LCOV_EXCL_START */
 int system_setting_unset_changed_callback_locale_timezone(system_settings_key_e key)
 {
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_TIMEZONE_ID, 4);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_TIMEZONE_ID, SYSTEM_SETTING_CALLBACK_SLOT_4);
 }
 /*  LCOV_EXCL_STOP */
 
@@ -1615,13 +1615,13 @@ int system_setting_get_time_changed(system_settings_key_e key, void **value)
 int system_setting_set_changed_callback_time_changed(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SYSTEM_TIME_CHANGED, SYSTEM_SETTINGS_KEY_TIME_CHANGED, 3, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SYSTEM_TIME_CHANGED, SYSTEM_SETTINGS_KEY_TIME_CHANGED, SYSTEM_SETTING_CALLBACK_SLOT_3, user_data);
 }
 
 int system_setting_unset_changed_callback_time_changed(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SYSTEM_TIME_CHANGED, 3);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SYSTEM_TIME_CHANGED, SYSTEM_SETTING_CALLBACK_SLOT_3);
 }
 
 
@@ -1643,13 +1643,13 @@ int system_setting_get_sound_lock(system_settings_key_e key, void **value)
 int system_setting_set_changed_callback_sound_lock(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, SYSTEM_SETTINGS_KEY_SOUND_LOCK, 3, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, SYSTEM_SETTINGS_KEY_SOUND_LOCK, SYSTEM_SETTING_CALLBACK_SLOT_3, user_data);
 }
 
 int system_setting_unset_changed_callback_sound_lock(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, 3);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, SYSTEM_SETTING_CALLBACK_SLOT_3);
 }
 
 /**
@@ -1726,14 +1726,14 @@ int system_setting_set_sound_silent_mode(system_settings_key_e key, void *value)
 int system_setting_set_changed_callback_sound_silent_mode(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE, 3, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE, SYSTEM_SETTING_CALLBACK_SLOT_3, user_data);
 }
 
 /* TODO */
 int system_setting_unset_changed_callback_sound_silent_mode(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, 3);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, SYSTEM_SETTING_CALLBACK_SLOT_3);
 }
 
 /* SYSTEM_SETTINGS_KEY_SOUND_TOUCH */
@@ -1760,13 +1760,13 @@ int system_setting_set_sound_touch(system_settings_key_e key, void *value)
 int system_setting_set_changed_callback_sound_touch(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, SYSTEM_SETTINGS_KEY_SOUND_TOUCH, 2, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, SYSTEM_SETTINGS_KEY_SOUND_TOUCH, SYSTEM_SETTING_CALLBACK_SLOT_2, user_data);
 }
 
 int system_setting_unset_changed_callback_sound_touch(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, 2);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, SYSTEM_SETTING_CALLBACK_SLOT_2);
 }
 
 #if 0
@@ -1814,13 +1814,13 @@ int system_setting_set_auto_rotation_mode(system_settings_key_e key, void *value
 int system_setting_set_changed_callback_auto_rotation_mode(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, SYSTEM_SETTINGS_KEY_DISPLAY_SCREEN_ROTATION_AUTO, 2, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, SYSTEM_SETTINGS_KEY_DISPLAY_SCREEN_ROTATION_AUTO, SYSTEM_SETTING_CALLBACK_SLOT_2, user_data);
 }
 
 int system_setting_unset_changed_callback_auto_rotation_mode(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, 2);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, SYSTEM_SETTING_CALLBACK_SLOT_2);
 }
 
 int system_setting_get_screen_backlight_time(system_settings_key_e key, void **value)
@@ -1861,13 +1861,13 @@ int system_setting_set_screen_backlight_time(system_settings_key_e key, void *va
 int system_setting_set_changed_callback_screen_backlight_time(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, 2, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, SYSTEM_SETTING_CALLBACK_SLOT_2, user_data);
 }
 
 int system_setting_unset_changed_callback_screen_backlight_time(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, 2);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, SYSTEM_SETTING_CALLBACK_SLOT_2);
 }
 
 int system_setting_get_sound_notification(system_settings_key_e key, void **value)
@@ -1908,13 +1908,13 @@ int system_setting_set_sound_notification(system_settings_key_e key, void *value
 int system_setting_set_changed_callback_sound_notification(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION, 0, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION, SYSTEM_SETTING_CALLBACK_SLOT_0, user_data);
 }
 
 int system_setting_unset_changed_callback_sound_notification(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, 0);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR, SYSTEM_SETTING_CALLBACK_SLOT_0);
 }
 
 int system_setting_get_notification_repetition_period(system_settings_key_e key, void **value)
@@ -1949,13 +1949,13 @@ int system_setting_set_notification_repetition_period(system_settings_key_e key,
 int system_setting_set_changed_callback_notification_repetition_period(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_ALERT_REP_TYPE_INT, SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION_REPETITION_PERIOD, 1, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_ALERT_REP_TYPE_INT, SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION_REPETITION_PERIOD, SYSTEM_SETTING_CALLBACK_SLOT_1, user_data);
 }
 
 int system_setting_unset_changed_callback_notification_repetition_period(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_ALERT_REP_TYPE_INT, 1);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_NOTI_MSG_ALERT_REP_TYPE_INT, SYSTEM_SETTING_CALLBACK_SLOT_1);
 }
 
 int system_setting_get_device_name(system_settings_key_e key, void **value)
@@ -1988,13 +1988,13 @@ int system_setting_set_device_name(system_settings_key_e key, void *value)
 int system_setting_set_changed_callback_device_name(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_DEVICE_NAME_STR, SYSTEM_SETTINGS_KEY_DEVICE_NAME, 0, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_DEVICE_NAME_STR, SYSTEM_SETTINGS_KEY_DEVICE_NAME, SYSTEM_SETTING_CALLBACK_SLOT_0, user_data);
 }
 
 int system_setting_unset_changed_callback_device_name(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_DEVICE_NAME_STR, 0);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_DEVICE_NAME_STR, SYSTEM_SETTING_CALLBACK_SLOT_0);
 }
 
 /*---------------------------------------------- */
@@ -2013,13 +2013,13 @@ int system_setting_get_network_flight_mode(system_settings_key_e key, void **val
 int system_setting_set_changed_callback_network_flight_mode(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_TELEPHONY_FLIGHT_MODE, SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, 3, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_TELEPHONY_FLIGHT_MODE, SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, SYSTEM_SETTING_CALLBACK_SLOT_3, user_data);
 }
 
 int system_setting_unset_changed_callback_network_flight_mode(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_TELEPHONY_FLIGHT_MODE, 3);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_TELEPHONY_FLIGHT_MODE, SYSTEM_SETTING_CALLBACK_SLOT_3);
 }
 
 int system_setting_get_network_wifi_notification(system_settings_key_e key, void **value)
@@ -2039,13 +2039,13 @@ int system_setting_get_network_wifi_notification(system_settings_key_e key, void
 int system_setting_set_changed_callback_network_wifi_notification(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_WIFI_ENABLE_QS, SYSTEM_SETTINGS_KEY_NETWORK_WIFI_NOTIFICATION, 4, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_WIFI_ENABLE_QS, SYSTEM_SETTINGS_KEY_NETWORK_WIFI_NOTIFICATION, SYSTEM_SETTING_CALLBACK_SLOT_4, user_data);
 }
 
 int system_setting_unset_changed_callback_network_wifi_notification(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_WIFI_ENABLE_QS, 4);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_WIFI_ENABLE_QS, SYSTEM_SETTING_CALLBACK_SLOT_4);
 }
 
 /*  LCOV_EXCL_START */
@@ -2081,14 +2081,14 @@ int system_setting_set_lock_state(system_settings_key_e key, void *value)
 /*  LCOV_EXCL_START */
 int system_setting_set_changed_callback_lock_state(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
-       return system_setting_vconf_set_changed_cb(VCONFKEY_IDLE_LOCK_STATE_READ_ONLY, SYSTEM_SETTINGS_KEY_LOCK_STATE, 4, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_IDLE_LOCK_STATE_READ_ONLY, SYSTEM_SETTINGS_KEY_LOCK_STATE, SYSTEM_SETTING_CALLBACK_SLOT_4, user_data);
 }
 /*  LCOV_EXCL_STOP */
 
 /*  LCOV_EXCL_START */
 int system_setting_unset_changed_callback_lock_state(system_settings_key_e key)
 {
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_IDLE_LOCK_STATE_READ_ONLY, 4);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_IDLE_LOCK_STATE_READ_ONLY, SYSTEM_SETTING_CALLBACK_SLOT_4);
 }
 /*  LCOV_EXCL_STOP */
 
@@ -2146,13 +2146,13 @@ int system_setting_set_ads_id(system_settings_key_e key, void *value)
 int system_setting_set_changed_callback_ads_id(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_AD_ID, SYSTEM_SETTINGS_KEY_ADS_ID, 0, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_AD_ID, SYSTEM_SETTINGS_KEY_ADS_ID, SYSTEM_SETTING_CALLBACK_SLOT_0, user_data);
 }
 
 int system_setting_unset_changed_callback_ads_id(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_AD_ID, 0);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_AD_ID, SYSTEM_SETTING_CALLBACK_SLOT_0);
 }
 
 int system_settings_feature_check_bool(char *path)
@@ -2383,28 +2383,28 @@ int system_setting_get_uds_state(system_settings_key_e key, void **value)
 /*  LCOV_EXCL_START */
 int system_setting_set_changed_callback_uds_state(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_UDSM, SYSTEM_SETTINGS_KEY_ULTRA_DATA_SAVE, 4, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_UDSM, SYSTEM_SETTINGS_KEY_ULTRA_DATA_SAVE, SYSTEM_SETTING_CALLBACK_SLOT_4, user_data);
 }
 /*  LCOV_EXCL_STOP */
 
 /*  LCOV_EXCL_START */
 int system_setting_unset_changed_callback_uds_state(system_settings_key_e key)
 {
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_UDSM, 4);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_UDSM, SYSTEM_SETTING_CALLBACK_SLOT_4);
 }
 /*  LCOV_EXCL_STOP */
 
 /*  LCOV_EXCL_START */
 int system_setting_set_changed_callback_uds_pkg_list(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_UDSM_PKGID_LIST, SYSTEM_SETTINGS_KEY_ULTRA_DATA_SAVE_PKG_LIST, 4, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_UDSM_PKGID_LIST, SYSTEM_SETTINGS_KEY_ULTRA_DATA_SAVE_PKG_LIST, SYSTEM_SETTING_CALLBACK_SLOT_4, user_data);
 }
 /*  LCOV_EXCL_STOP */
 
 /*  LCOV_EXCL_START */
 int system_setting_unset_changed_callback_uds_pkg_list(system_settings_key_e key)
 {
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_UDSM_PKGID_LIST, 4);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_UDSM_PKGID_LIST, SYSTEM_SETTING_CALLBACK_SLOT_4);
 }
 /*  LCOV_EXCL_STOP */
 
@@ -2439,13 +2439,13 @@ int system_setting_set_accessibility_tts(system_settings_key_e key, void *value)
 int system_setting_set_changed_callback_accessibility_tts(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, SYSTEM_SETTINGS_KEY_ACCESSIBILITY_TTS, 2, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, SYSTEM_SETTINGS_KEY_ACCESSIBILITY_TTS, SYSTEM_SETTING_CALLBACK_SLOT_2, user_data);
 }
 
 int system_setting_unset_changed_callback_accessibility_tts(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, 2);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, SYSTEM_SETTING_CALLBACK_SLOT_2);
 }
 
 /* SYSTEM_SETTINGS_KEY_VIBRATION */
@@ -2479,13 +2479,13 @@ int system_setting_set_vibration(system_settings_key_e key, void *value)
 int system_setting_set_changed_callback_vibration(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, SYSTEM_SETTINGS_KEY_VIBRATION, 2, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, SYSTEM_SETTINGS_KEY_VIBRATION, SYSTEM_SETTING_CALLBACK_SLOT_2, user_data);
 }
 
 int system_setting_unset_changed_callback_vibration(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, 2);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, SYSTEM_SETTING_CALLBACK_SLOT_2);
 }
 
 /* SYSTEM_SETTINGS_KEY_AUTOMATIC_TIME_UPDATE */
@@ -2519,13 +2519,13 @@ int system_setting_set_automatic_time_update(system_settings_key_e key, void *va
 int system_setting_set_changed_callback_automatic_time_update(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_STATE_AUTOMATIC_TIME_UPDATE_BOOL, SYSTEM_SETTINGS_KEY_AUTOMATIC_TIME_UPDATE, 2, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_STATE_AUTOMATIC_TIME_UPDATE_BOOL, SYSTEM_SETTINGS_KEY_AUTOMATIC_TIME_UPDATE, SYSTEM_SETTING_CALLBACK_SLOT_2, user_data);
 }
 
 int system_setting_unset_changed_callback_automatic_time_update(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_STATE_AUTOMATIC_TIME_UPDATE_BOOL, 2);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_STATE_AUTOMATIC_TIME_UPDATE_BOOL, SYSTEM_SETTING_CALLBACK_SLOT_2);
 }
 
 /* SYSTEM_SETTINGS_KEY_DEVELOPER_OPTION_STATE */
@@ -2559,13 +2559,13 @@ int system_setting_set_developer_option_state(system_settings_key_e key, void *v
 int system_setting_set_changed_callback_developer_option_state(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_DEVELOPER_OPTION_STATE, SYSTEM_SETTINGS_KEY_DEVELOPER_OPTION_STATE, 2, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_DEVELOPER_OPTION_STATE, SYSTEM_SETTINGS_KEY_DEVELOPER_OPTION_STATE, SYSTEM_SETTING_CALLBACK_SLOT_2, user_data);
 }
 
 int system_setting_unset_changed_callback_developer_option_state(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_DEVELOPER_OPTION_STATE, 2);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_DEVELOPER_OPTION_STATE, SYSTEM_SETTING_CALLBACK_SLOT_2);
 }
 
 /* SYSTEM_SETTINGS_KEY_ACCESSIBILITY_GRAYSCALE */
@@ -2599,13 +2599,13 @@ int system_setting_set_accessibility_grayscale(system_settings_key_e key, void *
 int system_setting_set_changed_callback_accessibility_grayscale(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_GREYSCALE, SYSTEM_SETTINGS_KEY_ACCESSIBILITY_GRAYSCALE, 2, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_GREYSCALE, SYSTEM_SETTINGS_KEY_ACCESSIBILITY_GRAYSCALE, SYSTEM_SETTING_CALLBACK_SLOT_2, user_data);
 }
 
 int system_setting_unset_changed_callback_accessibility_grayscale(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_GREYSCALE, 2);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_GREYSCALE, SYSTEM_SETTING_CALLBACK_SLOT_2);
 }
 
 /* SYSTEM_SETTINGS_KEY_ACCESSIBILITY_NEGATIVE_COLOR */
@@ -2639,13 +2639,13 @@ int system_setting_set_accessibility_negative_color(system_settings_key_e key, v
 int system_setting_set_changed_callback_accessibility_negative_color(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_HIGH_CONTRAST, SYSTEM_SETTINGS_KEY_ACCESSIBILITY_NEGATIVE_COLOR, 2, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_HIGH_CONTRAST, SYSTEM_SETTINGS_KEY_ACCESSIBILITY_NEGATIVE_COLOR, SYSTEM_SETTING_CALLBACK_SLOT_2, user_data);
 }
 
 int system_setting_unset_changed_callback_accessibility_negative_color(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_HIGH_CONTRAST, 2);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ACCESSIBILITY_HIGH_CONTRAST, SYSTEM_SETTING_CALLBACK_SLOT_2);
 }
 
 /* SYSTEM_SETTINGS_KEY_ROTARY_EVENT_ENABLED */
@@ -2682,7 +2682,7 @@ int system_setting_set_rotary_event_enabled(system_settings_key_e key, void *val
 int system_setting_set_changed_callback_rotary_event_enabled(system_settings_key_e key, system_settings_changed_cb callback, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ROTARY_EVENT_ENABLED_BOOL, SYSTEM_SETTINGS_KEY_ROTARY_EVENT_ENABLED, 3, user_data);
+       return system_setting_vconf_set_changed_cb(VCONFKEY_SETAPPL_ROTARY_EVENT_ENABLED_BOOL, SYSTEM_SETTINGS_KEY_ROTARY_EVENT_ENABLED, SYSTEM_SETTING_CALLBACK_SLOT_3, user_data);
 }
 /*  LCOV_EXCL_STOP */
 
@@ -2690,7 +2690,7 @@ int system_setting_set_changed_callback_rotary_event_enabled(system_settings_key
 int system_setting_unset_changed_callback_rotary_event_enabled(system_settings_key_e key)
 {
        SETTING_TRACE_BEGIN;
-       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ROTARY_EVENT_ENABLED_BOOL, 3);
+       return system_setting_vconf_unset_changed_cb(VCONFKEY_SETAPPL_ROTARY_EVENT_ENABLED_BOOL, SYSTEM_SETTING_CALLBACK_SLOT_3);
 }
 /*  LCOV_EXCL_STOP */
 

diff --git a/src/system_settings_vconf.c b/src/system_settings_vconf.c
index 03639e7..ca2bad2 100644 (file)
--- a/src/system_settings_vconf.c
+++ b/src/system_settings_vconf.c
@@ -148,137 +148,62 @@ static void system_setting_vconf_event_cb0(keynode_t *node, void *event_data)
 /*  LCOV_EXCL_START */
 static void system_setting_vconf_event_cb1(keynode_t *node, void *event_data)
 {
-       system_settings_key_e pkey = (system_settings_key_e)event_data;
-
-       if (node != NULL) {
-               system_setting_h system_setting_item;
-
-               int ret = system_settings_get_item(pkey, &system_setting_item);
-               if (ret != 0) {
-                       if (ret == SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER)
-                               LOGE("[%s] INVALID_PARAMETER(0x%08x) : invalid key", __FUNCTION__, SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER);
-               }
-
-               void *user_data = NULL;
-               user_data = system_setting_item->user_data;
-               system_setting_item->changed_cb(pkey, user_data);
-       }
+       system_setting_vconf_event_cb0(node, event_data);
 }
 /*  LCOV_EXCL_STOP */
 
 /*  LCOV_EXCL_START */
 static void system_setting_vconf_event_cb2(keynode_t *node, void *event_data)
 {
-       system_settings_key_e pkey = (system_settings_key_e)event_data;
-
-       if (node != NULL) {
-               system_setting_h system_setting_item;
-
-               int ret = system_settings_get_item(pkey, &system_setting_item);
-               if (ret != 0) {
-                       if (ret == SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER)
-                               LOGE("[%s] INVALID_PARAMETER(0x%08x) : invalid key", __FUNCTION__, SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER);
-               }
-
-               void *user_data = NULL;
-               user_data = system_setting_item->user_data;
-               system_setting_item->changed_cb(pkey, user_data);
-       }
+       system_setting_vconf_event_cb0(node, event_data);
 }
 /*  LCOV_EXCL_STOP */
 
 /*  LCOV_EXCL_START */
 static void system_setting_vconf_event_cb3(keynode_t *node, void *event_data)
 {
-       system_settings_key_e pkey = (system_settings_key_e)event_data;
-
-       if (node != NULL) {
-               system_setting_h system_setting_item;
-
-               int ret = system_settings_get_item(pkey, &system_setting_item);
-               if (ret != 0) {
-                       if (ret == SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER)
-                               LOGE("[%s] INVALID_PARAMETER(0x%08x) : invalid key", __FUNCTION__, SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER);
-               }
-
-               void *user_data = NULL;
-               user_data = system_setting_item->user_data;
-               system_setting_item->changed_cb(pkey, user_data);
-       }
+       system_setting_vconf_event_cb0(node, event_data);
 }
 /*  LCOV_EXCL_STOP */
 
 /*  LCOV_EXCL_START */
 static void system_setting_vconf_event_cb4(keynode_t *node, void *event_data)
 {
-       system_settings_key_e pkey = (system_settings_key_e)event_data;
-
-       if (node != NULL) {
-               system_setting_h system_setting_item;
-
-               int ret = system_settings_get_item(pkey, &system_setting_item);
-               if (ret != 0) {
-                       if (ret == SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER)
-                               LOGE("[%s] INVALID_PARAMETER(0x%08x) : invalid key", __FUNCTION__, SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER);
-               }
-
-               void *user_data = NULL;
-               user_data = system_setting_item->user_data;
-               system_setting_item->changed_cb(pkey, user_data);
-       }
+       system_setting_vconf_event_cb0(node, event_data);
 }
 /*  LCOV_EXCL_STOP */
 
 /*  LCOV_EXCL_START */
-static void system_setting_vconf_event_cb100(keynode_t *node, void *event_data)
+static void system_setting_vconf_event_cb5(keynode_t *node, void *event_data)
 {
-       system_settings_key_e pkey = (system_settings_key_e)event_data;
-
-       if (node != NULL) {
-               system_setting_h system_setting_item;
-
-               int ret = system_settings_get_item(pkey, &system_setting_item);
-               if (ret != 0) {
-                       if (ret == SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER)
-                               LOGE("[%s] INVALID_PARAMETER(0x%08x) : invalid key", __FUNCTION__, SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER);
-               }
-
-               void *user_data = NULL;
-               user_data = system_setting_item->user_data;
-               system_setting_item->changed_cb(pkey, user_data);
-       }
+       system_setting_vconf_event_cb0(node, event_data);
 }
 /*  LCOV_EXCL_STOP */
 
 
 /*  LCOV_EXCL_START */
-static system_setting_vconf_event_cb system_setting_vconf_get_event_cb_slot(int slot)
+static system_setting_vconf_event_cb system_setting_vconf_get_event_cb_slot(system_setting_callback_slot_e slot)
 {
        switch (slot) {
-       case 0:
+       case SYSTEM_SETTING_CALLBACK_SLOT_0:
                return system_setting_vconf_event_cb0;
-
-       case 1:
+       case SYSTEM_SETTING_CALLBACK_SLOT_1:
                return system_setting_vconf_event_cb1;
-
-       case 2:
+       case SYSTEM_SETTING_CALLBACK_SLOT_2:
                return system_setting_vconf_event_cb2;
-
-       case 3:
+       case SYSTEM_SETTING_CALLBACK_SLOT_3:
                return system_setting_vconf_event_cb3;
-
-       case 4:
+       case SYSTEM_SETTING_CALLBACK_SLOT_4:
                return system_setting_vconf_event_cb4;
-       case 100:
-               return system_setting_vconf_event_cb100;
-
+       case SYSTEM_SETTING_CALLBACK_SLOT_5:
+               return system_setting_vconf_event_cb5;
        default:
                return NULL;
        }
 }
 /*  LCOV_EXCL_STOP */
 
-int system_setting_vconf_set_changed_cb(const char *vconf_key, system_settings_key_e key, int slot, void *user_data)
+int system_setting_vconf_set_changed_cb(const char *vconf_key, system_settings_key_e key, system_setting_callback_slot_e slot, void *user_data)
 {
        system_setting_vconf_event_cb vconf_event_cb;
 
@@ -302,7 +227,7 @@ int system_setting_vconf_set_changed_cb(const char *vconf_key, system_settings_k
        return SYSTEM_SETTINGS_ERROR_NONE;
 }
 
-int system_setting_vconf_unset_changed_cb(const char *vconf_key, int slot)
+int system_setting_vconf_unset_changed_cb(const char *vconf_key, system_setting_callback_slot_e slot)
 {
        system_setting_vconf_event_cb vconf_event_cb;