SCQV/SVACE fixes

Change-Id: I0d3a3ce8219cd5e4cf080d9b62741651ba55ad50
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/setting-common/src/setting-common-draw-widget.c b/setting-common/src/setting-common-draw-widget.c
index e24c8327ef3211170372b581f5595ab6a2aae5ad..b6826b98efca099ea8e57e6b520a586cd22fc11f 100644 (file)
--- a/setting-common/src/setting-common-draw-widget.c
+++ b/setting-common/src/setting-common-draw-widget.c
@@ -622,7 +622,7 @@ char *setting_customize_text(
 
        if (color) {
                char input_str1[MAX_SPECIALIZITION_LEN] = { 0, };
-               safeCopyStr(input_str1, input_str, MAX_SPECIALIZITION_LEN);
+               safeCopyStr(input_str1, input_str, MAX_SPECIALIZITION_LEN - 1);
                char *p = strstr(input_str1, "<color=");
                /*already has customed color,to replace color sub_string */
                if (p) {

diff --git a/setting-profile/src/setting-profile-common.c b/setting-profile/src/setting-profile-common.c
index 59ef9518167751b9c612dcc7be4a1f4a274f265b..df2e0b1822417d91e1f8c107b794b2b603ed749e 100755 (executable)
--- a/setting-profile/src/setting-profile-common.c
+++ b/setting-profile/src/setting-profile-common.c
@@ -238,12 +238,8 @@ bool setting_sound_play_sound(
        if (is_existing == SETTING_RETURN_FAIL || NULL == ringtone_file) {
                switch (sound_type) {
                case SOUND_TYPE_RINGTONE:
-                       if (isEmulBin())
                                ad->song_playing = (char *)g_strdup(
-                                               SETTING_DEFAULT_CALL_TONE_SDK);
-                       else
-                               ad->song_playing = (char *)g_strdup(
-                                               SETTING_DEFAULT_CALL_TONE);
+                               _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3");
                        sound_stream_info_to_set =
                                        ad->ringtone_sound_stream_info;
                        break;
@@ -253,7 +249,7 @@ bool setting_sound_play_sound(
                                                SETTING_DEFAULT_CALL_TONE_SDK);
                        else
                                ad->song_playing = (char *)g_strdup(
-                                               SETTING_DEFAULT_MEDIA_TONE);
+                               _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3");
                        sound_stream_info_to_set = ad->media_sound_stream_info;
                        break;
                case SOUND_TYPE_NOTIFICATION:
@@ -885,15 +881,9 @@ static void __sound_vconf_change_cb(keynode_t *key, void *data)
                                        SETTING_PROFILE_MMC_PATH,
                                        call_tone,
                                        safeStrLen(SETTING_PROFILE_MMC_PATH))) {
-                               if (isEmulBin()) {
-                                       ret = vconf_set_str(
-                                                       VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR,
-                                                       SETTING_DEFAULT_CALL_TONE_SDK);
-                               } else {
                                        ret = vconf_set_str(
-                                                       VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR,
-                                                       SETTING_DEFAULT_CALL_TONE);
-                               }
+                                               VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR,
+                                               _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3");
                                if (ret < 0)
                                        SETTING_TRACE_DEBUG(
                                                        "failed to set vconf");