Remove system-settings dependency

- Get Ringtone path using vconfkey

Change-Id: Iea9d680f85f8c6fc3c8ed8d42b1bd47aa99ce148
Signed-off-by: pr.jung <pr.jung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4feb3836c39cfd9c3d86d4956dd079e2a89a04e..3169d78b90b0d8eba71bf5f7b2b98d9f261f370e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,6 @@ SET(dependents
                glib-2.0
                gio-2.0
                libtzplatform-config
-               capi-system-system-settings
                mount
 )
 SET(pc_dependents "capi-base-common")

diff --git a/packaging/libstorage.spec b/packaging/libstorage.spec
index 90eae50af00259febdea6dd45d73415eae8c04f9..57611e77b88a67adff9062f806a819412a2668ab 100644 (file)
--- a/packaging/libstorage.spec
+++ b/packaging/libstorage.spec
@@ -13,7 +13,6 @@ BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(libtzplatform-config)
-BuildRequires:  pkgconfig(capi-system-system-settings)
 BuildRequires:  pkgconfig(mount)
 
 %description

diff --git a/src/storage.c b/src/storage.c
index 26b4036b9169f012086376a7b550f509dbe28344..42aaec29af1084d2b6cb6082b3d0afeab1a55d57 100644 (file)
--- a/src/storage.c
+++ b/src/storage.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <system_settings.h>
+#include <vconf.h>
 
 #include "common.h"
 #include "list.h"
@@ -164,11 +164,9 @@ API int storage_get_directory(int storage_id, storage_directory_e type, char **p
        if (found && st) {
                snprintf(root, sizeof(root), "%s", st->root());
                if (type == STORAGE_DIRECTORY_SYSTEM_RINGTONES) {
-                       ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, &temp2);
-                       if (ret < 0) {
-                               _E("Failed to get ringtone path : %d", ret); //LCOV_EXCL_LINE
+                       temp2 = vconf_get_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
+                       if (temp2 == NULL)
                                return STORAGE_ERROR_OPERATION_FAILED;
-                       }
                        end = strrchr(temp2, '/');
                        if (end)
                                *end = '\0';