Paths updated in setting-ringtone-profile projects

Change-Id: I1839fa8eaf71ffececf3cf645c1c2a8b7ace7972
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/setting-ringtone/.cproject b/setting-ringtone/.cproject
index d70f810c2242f5fc8048c3217f3a27f5daa68840..1a2acbb9de99137624df72321948ae31397f6750 100644 (file)
--- a/setting-ringtone/.cproject
+++ b/setting-ringtone/.cproject
@@ -357,13 +357,6 @@
                                                                        <listOptionValue builtIn="false" value="TIZEN_DEPRECATION"/>
                                                                        <listOptionValue builtIn="false" value="DEPRECATION_WARNING"/>
                                                                        <listOptionValue builtIn="false" value="_DEBUG"/>
-                                                                       <listOptionValue builtIn="false" value="_TZ_SYS_RO_APP=TZ_SYS_RO_APP"/>
-                                                                       <listOptionValue builtIn="false" value="TZ_SYS_RO_APP=\&quot;/usr/apps/\&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="_TZ_SYS_GLOBALUSER_DATA=TZ_SYS_GLOBALUSER_DATA"/>
-                                                                       <listOptionValue builtIn="false" value="TZ_SYS_GLOBALUSER_DATA=\&quot;/opt/usr/data\&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="_TZ_SYS_SHARE=TZ_SYS_SHARE"/>
-                                                                       <listOptionValue builtIn="false" value="TZ_SYS_SHARE=\&quot;/opt/share\&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="TZ_SYS_RO_APP=\&quot;/usr/apps/\&quot;"/>
                                                                        <listOptionValue builtIn="false" value="PACKAGE=\&quot;${APPID}\&quot;"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1820195972" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
@@ -389,6 +382,7 @@
                                                                        <listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="setting-common"/>
                                                                        <listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="vconf"/>
                                                                        <listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="call-manager"/>
+                                                                       <listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="tzplatform-config-2.0"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1890743572" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
                                                                        <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -405,7 +399,7 @@
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib.711622839" name="Archive Generator" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.po.compiler.650576517" name="PO Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.po.compiler"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.2112751090" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler">
-                                                               <option id="sbi.gnu.edc.compiler.option.misc.id.555244694" superClass="sbi.gnu.edc.compiler.option.misc.id" useByScannerDiscovery="false" valueType="stringList">
+                                                               <option id="sbi.gnu.edc.compiler.option.misc.id.555244694" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" useByScannerDiscovery="false" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/edje/images&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/res/images&quot;"/>
                                                                </option>

diff --git a/setting-ringtone/inc/setting-ringtone.h b/setting-ringtone/inc/setting-ringtone.h
index 30ec17a32c11a65d321602431749947618531668..caed52b48d50963d273fd5f6a1ce386124c4c7fc 100644 (file)
--- a/setting-ringtone/inc/setting-ringtone.h
+++ b/setting-ringtone/inc/setting-ringtone.h
@@ -34,14 +34,12 @@
 
 #define SETTING_RINGTONE_PACKAGE_NAME "org.tizen.setting-ringtone"
 
-#define RINGTONE_DIR_PATH      _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones"
-#define RINGTONE_DIR_PATH_1    _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/"
-#define ALERT_DIR_PATH         _TZ_SYS_GLOBALUSER_DATA"/settings/Alerts"
-#define ALERT_DIR_PATH_1       _TZ_SYS_GLOBALUSER_DATA"/settings/Alerts/"
-#define RINGTONE_FILE_PATH_DEF _TZ_SYS_GLOBALUSER_DATA\
-                               "/settings/Ringtones/ringtone_sdk.mp3"
-#define ALERT_FILE_PATH_DEF    _TZ_SYS_GLOBALUSER_DATA\
-                               "/settings/Alerts/General notification_sdk.wav"
+#define RINGTONE_DIR_PATH      "/media/settings/Ringtones"
+#define RINGTONE_DIR_PATH_1    "/media/settings/Ringtones/"
+#define ALERT_DIR_PATH         "/media/settings/Alerts"
+#define ALERT_DIR_PATH_1       "/media/settings/Alerts/"
+#define RINGTONE_FILE_PATH_DEF "/media/settings/Ringtones/ringtone_sdk.mp3"
+#define ALERT_FILE_PATH_DEF    "/media/settings/Alerts/General notification_sdk.wav"
 
 /**
  * SettingRingtoneData contains module specific runtime data.

diff --git a/setting-ringtone/src/setting-ringtone-main.c b/setting-ringtone/src/setting-ringtone-main.c
index 7853a60a78e53f1dac2b390170dbd9e004586a93..cb6b62a97d73ef5ac4a8c12fe59cc1d3c110f116 100755 (executable)
--- a/setting-ringtone/src/setting-ringtone-main.c
+++ b/setting-ringtone/src/setting-ringtone-main.c
@@ -27,6 +27,7 @@
 #include <efl_extension_events.h>
 #include <system_settings.h>
 #include <call-manager.h>
+#include <tzplatform_config.h>
 
 static int setting_ringtone_create(void *cb);
 static int setting_ringtone_destroy(void *cb);
@@ -367,9 +368,9 @@ static char *_get_default_filepath(SettingRingtoneData *ad)
                return strndup(ad->default_substitution, PATH_MAX);
 
        if (ad->show_notification)
-               return strndup(ALERT_FILE_PATH_DEF, PATH_MAX);
+               return strndup(tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, ALERT_FILE_PATH_DEF), PATH_MAX);
 
-       return strndup(RINGTONE_FILE_PATH_DEF, PATH_MAX);
+       return strndup(tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, RINGTONE_FILE_PATH_DEF), PATH_MAX);
 }
 
 static void _move_more_ctxpopup(SettingRingtoneData *ad)
@@ -536,26 +537,20 @@ static void _append_default_ringtones(SettingRingtoneData *ad)
 
        /* Get the default file list first. */
        if (ad->show_notification) {
-               ret = get_filelist_from_dir_path(ALERT_DIR_PATH, &ad->filelist);
+               ret = get_filelist_from_dir_path(tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, ALERT_DIR_PATH), &ad->filelist);
                if (ret != 0)
-                       SETTING_TRACE_ERROR(
-                               "Failed to get default file list from %s",
-                               ALERT_DIR_PATH);
-               append_custom_dir = (safeStrCmp(ALERT_DIR_PATH,
-                                               ad->appctl_dir_path)
-                               && safeStrCmp(ALERT_DIR_PATH_1,
-                                               ad->appctl_dir_path));
+                       SETTING_TRACE_ERROR("Failed to get default file list from %s", tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, ALERT_DIR_PATH));
+
+               append_custom_dir = (safeStrCmp(tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, ALERT_DIR_PATH), ad->appctl_dir_path)
+                               && safeStrCmp(tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, ALERT_DIR_PATH_1), ad->appctl_dir_path));
        } else {
-               ret = get_filelist_from_dir_path(RINGTONE_DIR_PATH,
-                                               &ad->filelist);
+               ret = get_filelist_from_dir_path(tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, RINGTONE_DIR_PATH), &ad->filelist);
+
                if (ret != 0)
-                       SETTING_TRACE_ERROR(
-                               "Failed to get default file list from %s",
-                               RINGTONE_DIR_PATH);
-               append_custom_dir = (safeStrCmp(RINGTONE_DIR_PATH,
-                                               ad->appctl_dir_path)
-                       && safeStrCmp(RINGTONE_DIR_PATH_1,
-                                       ad->appctl_dir_path));
+                       SETTING_TRACE_ERROR( "Failed to get default file list from %s", tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, RINGTONE_DIR_PATH));
+
+               append_custom_dir = (safeStrCmp(tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, RINGTONE_DIR_PATH), ad->appctl_dir_path)
+                       && safeStrCmp(tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, RINGTONE_DIR_PATH_1), ad->appctl_dir_path));
        }
 
        /* Also if appctl caller has added custom dir, append it: */
@@ -623,8 +618,7 @@ void setting_ringtone_append_user_ringtones(SettingRingtoneData *ad)
                        ad);
 
        if (ret != 0)
-               SETTING_TRACE_ERROR("Failed to get filelist, ret = %s %s",
-                               get_error_message(ret), RINGTONE_DIR_PATH);
+               SETTING_TRACE_ERROR("Failed to get filelist, ret = %s %s", get_error_message(ret),  tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, RINGTONE_DIR_PATH));
 
 }
 

diff --git a/setting-ringtone/src/setting-ringtone.c b/setting-ringtone/src/setting-ringtone.c
index d53e4caeb81db54eaf8a936bf0c84fb57011f024..a200162be52c54c7e480f6a96bbc5d0e4775c986 100644 (file)
--- a/setting-ringtone/src/setting-ringtone.c
+++ b/setting-ringtone/src/setting-ringtone.c
@@ -30,6 +30,7 @@
 #include <setting-debug.h>
 #include <setting-common-data-type.h>
 #include <setting-common-general-func.h>
+#include <tzplatform_config.h>
 
 extern setting_view setting_view_ringtone_main;
 
@@ -72,8 +73,8 @@ bool __parse_appctl_request(app_control_h service, void *priv)
                 * the default paths as extension path. In this case we
                 * can't list directory twice. */
                ad->appctl_dir_path = strndup(paths[0], PATH_MAX);
-               if (!strncmp(paths[0], RINGTONE_DIR_PATH, PATH_MAX) ||
-                       !strncmp(paths[0], RINGTONE_DIR_PATH_1, PATH_MAX)) {
+               if (!strncmp(paths[0], tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, RINGTONE_DIR_PATH), PATH_MAX) ||
+                       !strncmp(paths[0], tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, RINGTONE_DIR_PATH_1), PATH_MAX)) {
                        ad->show_notification = false;
                        free(ad->appctl_dir_path);
                        ad->appctl_dir_path = NULL;
@@ -81,8 +82,8 @@ bool __parse_appctl_request(app_control_h service, void *priv)
                                        "ringtone path as extension path");
                }
 
-               if (!strncmp(paths[0], ALERT_DIR_PATH, PATH_MAX) ||
-                       !strncmp(paths[0], ALERT_DIR_PATH_1, PATH_MAX)) {
+               if (!strncmp(paths[0], tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, ALERT_DIR_PATH), PATH_MAX) ||
+                       !strncmp(paths[0], tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, ALERT_DIR_PATH_1), PATH_MAX)) {
                        ad->show_notification = true;
                        free(ad->appctl_dir_path);
                        ad->appctl_dir_path = NULL;
@@ -92,15 +93,15 @@ bool __parse_appctl_request(app_control_h service, void *priv)
        }
        free(paths);
 
+       char *path = NULL;
+
        if (!ad->appctl_dir_path || strnlen(ad->appctl_dir_path, PATH_MAX) == 0) {
                if (!ad->show_notification) {
-                       SETTING_TRACE("custom dir path is NULL, only setting "\
-                                       "defaults will be shown %s",
-                                       _TZ_SYS_SHARE"/settings/Ringtones");
+                       path = tzplatform_mkpath(TZ_SYS_SHARE, "/settings/Ringtones");
+                       SETTING_TRACE("custom dir path is NULL, only setting defaults will be shown %s", path);
                } else {
-                       SETTING_TRACE("custom dir path is NULL, only setting "\
-                                       "defaults will be shown %s",
-                                       _TZ_SYS_GLOBALUSER_DATA"/settings/Alerts");
+                       path = tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, "/settings/Alerts");
+                       SETTING_TRACE("custom dir path is NULL, only setting defaults will be shown %s", path);
                }
        }