code sync with tizen

Change-Id: Iafdbcb69f85ae67f11e797d59118dccf24461a68

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf335a7..03434f9 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,7 @@ set (SETTING_DEF_RES_PATH "\"${SETTING_DEF_RES}\"")
 set (SETTING_TIME_ZONEINFO_PATH "\"/usr/share/zoneinfo/\"")
 set (SETTING_TZONE_SYMLINK_PATH "\"/opt/etc/localtime\"")
 
+#      DSETTING_DEF_RES
 configure_file (
                "${PROJECT_SOURCE_DIR}/system-setting-config.h.in"
                "${PROJECT_SOURCE_DIR}/include/system-setting-config.h"
@@ -62,6 +63,7 @@ ADD_DEFINITIONS("-D_TZ_SYS_DATA=\"${TZ_SYS_DATA}\"")
 ADD_DEFINITIONS("-D_TZ_SYS_ETC=\"${TZ_SYS_ETC}\"")
 ADD_DEFINITIONS("-D_TZ_SYS_RO_SHARE=\"${TZ_SYS_RO_SHARE}\"")
 ADD_DEFINITIONS("-D_TZ_SYS_SHARE=\"${TZ_SYS_SHARE}\"")
+ADD_DEFINITIONS("-DSETTING_DEF_RES=\"${SETTING_DEF_RES}\"")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 

diff --git a/packaging/capi-system-system-settings.spec b/packaging/capi-system-system-settings.spec
index 8eb9daf..8a0464f 100755 (executable)
--- a/packaging/capi-system-system-settings.spec
+++ b/packaging/capi-system-system-settings.spec
@@ -95,8 +95,6 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
        -DTZ_SYS_RO_SHARE=%{TZ_SYS_RO_SHARE} \
        -DTZ_SYS_SHARE=%{TZ_SYS_SHARE} \
        -DSETTING_DEF_RES=%{TZ_SYS_GLOBALUSER_DATA}/settings
-#      -DSETTING_DEF_RES=/opt/share/settings
-
 
 make %{?jobs:-j%jobs}
 

diff --git a/src/system_setting_platform.c b/src/system_setting_platform.c
index aca93c7..54b091d 100644 (file)
--- a/src/system_setting_platform.c
+++ b/src/system_setting_platform.c
@@ -283,7 +283,7 @@ int _is_file_accessible(const char *path)
 
 /*////////////////////////////////////////////////////////////////////////////////////////////////// */
 // @todo move to CMake
-#define DEF_RINGTONE_FILE_PATH SETTING_DEF_RES_PATH"/Ringtones"
+#define DEF_RINGTONE_FILE_PATH SETTING_DEF_RES"/Ringtones"
 
 #define USR_RINGTONE_FILE_PATH "/home/owner/content/Sounds/Ringtones"
 #define JSONFILE "/opt/home/owner/apps_rw/org.tizen.setting/data/.user-ringtones.json"