Remove 'Screen lock sound'

- from Sound > Other sounds

Change-Id: I499914a5d84083846d46afc42bf47dc7ff4888f1
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/setting-font/src/setting-font-main.c b/setting-font/src/setting-font-main.c
index d9c2d7f14fb73ae8d7ad030981e0074b6870ffbf..09b8c77f4e98589e0b04e034d0e3c1418d6fb1a1 100755 (executable)
--- a/setting-font/src/setting-font-main.c
+++ b/setting-font/src/setting-font-main.c
@@ -77,7 +77,7 @@ static Eina_Bool _view_pop_cb(void *data, Elm_Object_Item *it)
 {
        SETTING_TRACE_BEGIN;
 
-       retm_if(data == NULL, "Data parameter is NULL");
+       retvm_if(data == NULL, EINA_TRUE, "Data parameter is NULL");
        SettingFontData *ad = (SettingFontData *)data;
 
        if (ad->size_change_flag) {

diff --git a/setting-profile/include/setting-profile-other-sounds.h b/setting-profile/include/setting-profile-other-sounds.h
index dfbf04b966bc847945d7ab1abcf275acbfb4ed53..03e7a6ba990e1ce6a88d3fa262e30eb781fadd5f 100644 (file)
--- a/setting-profile/include/setting-profile-other-sounds.h
+++ b/setting-profile/include/setting-profile-other-sounds.h
@@ -21,15 +21,9 @@
 #include <stdbool.h>
 
 bool setting_profile_other_sound_touch_sound_enabled();
-
 void setting_profile_other_sound_enable_touch_sound(bool val);
 
-bool setting_profile_other_sound_screen_lock_sound_enabled();
-
-void setting_profile_other_sound_enable_screen_lock_sound(bool val);
-
 bool setting_profile_other_sound_keyboard_sound_enabled();
-
 void setting_profile_other_sound_enable_keyboard_sound(bool val);
 
 #endif /* end of include guard: SETTING_PROFILE_OTHER_SOUNDS_H */

diff --git a/setting-profile/src/setting-profile-other-sounds-view.c b/setting-profile/src/setting-profile-other-sounds-view.c
index 0a4400a62277392d84035ab80bcf524e76c81f5d..cab8290c8a654979103c0d2a213ba3f5f76e8703 100644 (file)
--- a/setting-profile/src/setting-profile-other-sounds-view.c
+++ b/setting-profile/src/setting-profile-other-sounds-view.c
@@ -44,10 +44,6 @@ static struct item items[] = {
                "Touch sound", "Play sound when making screen selection",
                setting_profile_other_sound_touch_sound_enabled, setting_profile_other_sound_enable_touch_sound
        },
-       {
-               "Screen lock sound", "Play sounds when locking and unlocking screen",
-               setting_profile_other_sound_screen_lock_sound_enabled, setting_profile_other_sound_enable_screen_lock_sound
-       },
        {
                "Keyboard sound", "Sound feedback for system keyboard",
                setting_profile_other_sound_keyboard_sound_enabled, setting_profile_other_sound_enable_keyboard_sound

diff --git a/setting-profile/src/setting-profile-other-sounds.c b/setting-profile/src/setting-profile-other-sounds.c
index 690c10fdef963a9507dc643d570940791e5cd2a2..af8d3744ce19914a975c5aee79fb76a4e5c10bad 100644 (file)
--- a/setting-profile/src/setting-profile-other-sounds.c
+++ b/setting-profile/src/setting-profile-other-sounds.c
@@ -43,16 +43,6 @@ void setting_profile_other_sound_enable_touch_sound(bool val)
        setting_vconf_set_bool(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, val);
 }
 
-bool setting_profile_other_sound_screen_lock_sound_enabled()
-{
-       return setting_vconf_get_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL);
-}
-
-void setting_profile_other_sound_enable_screen_lock_sound(bool val)
-{
-       setting_vconf_set_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, val);
-}
-
 bool setting_profile_other_sound_keyboard_sound_enabled()
 {
        return setting_vconf_get_bool(VCONFKEY_SETAPPL_BUTTON_SOUNDS_BOOL);