modules/setting/silent: util_* function used.

Change-Id: If45018c460b7fc398fed24737e3aecff5e2ba067
Signed-off-by: Radoslaw Czerski <r.czerski@samsung.com>

diff --git a/src/modules/setting/silent.c b/src/modules/setting/silent.c
index ec60c69f202ab405432065fc28af1cb89f305080..3eb67060aa5b8d5b6d65e3013c7141f33436e79f 100644 (file)
--- a/src/modules/setting/silent.c
+++ b/src/modules/setting/silent.c
@@ -29,6 +29,7 @@
 #include "modules.h"
 #include "icon.h"
 #include "log.h"
+#include "util.h"
 
 #define ICON_PRIORITY  INDICATOR_PRIORITY_SYSTEM_6
 #define MODULE_NAME            "silent"
@@ -185,12 +186,12 @@ static int register_silent_module(void *data)
 
        set_app_state(data);
 
-       ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE, _system_setting_silent_change_cb, data);
+       ret = util_system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE, _system_setting_silent_change_cb, data);
        retvm_if(ret != SYSTEM_SETTINGS_ERROR_NONE, ret, "Failed to set silent mode change callback function.");
 
-       ret = runtime_info_set_changed_cb(RUNTIME_INFO_KEY_VIBRATION_ENABLED, _runtime_info_vibration_change_cb, data);
+       ret = util_runtime_info_set_changed_cb(RUNTIME_INFO_KEY_VIBRATION_ENABLED, _runtime_info_vibration_change_cb, data);
        if (ret != RUNTIME_INFO_ERROR_NONE)
-               system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE);
+               util_system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE, _system_setting_silent_change_cb);
 
        retvm_if(ret != RUNTIME_INFO_ERROR_NONE, ret, "Failed to set vibration change callback function.");
 
@@ -207,16 +208,9 @@ static int register_silent_module(void *data)
 
 static int unregister_silent_module(void)
 {
-       int ret;
-
-       ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE)
-               _E("Failed to unset silent mode change callback function.");
+       util_system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE, _system_setting_silent_change_cb);
+       util_runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_VIBRATION_ENABLED, _runtime_info_vibration_change_cb);
 
-       ret = runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_VIBRATION_ENABLED);
-       if (ret != RUNTIME_INFO_ERROR_NONE)
-               _E("Failed to unset vibration change callback function.");
-
-       return ret;
+       return OK;
 }
 /* End of file */