fix bug : N_SE-647

patchset7. remove merge conflict

Change-Id: I4057718ebad8239367ac684872c15ec18c46de48

diff --git a/packaging/settings.spec b/packaging/settings.spec
index 9e1e5c5..83ae1a1 100755 (executable)
--- a/packaging/settings.spec
+++ b/packaging/settings.spec
@@ -123,17 +123,8 @@ GOPTION="-g 6514"
        vconftool $GOPTION set -t int memory/setting/usb_in_mode_change "0" -i -f
 
 #resetSound
-%ifarch %{arm}
-       DEFAULT_CALL_TONE="/opt/share/settings/Ringtones/Over the horizon.mp3"
-%else
        DEFAULT_CALL_TONE="/opt/share/settings/Ringtones/ringtone_sdk.mp3"
-%endif
-
-%ifarch %{arm}
-       DEFAULT_NOTI_TONE="/opt/share/settings/Alerts/Whistle.mp3"
-%else
        DEFAULT_NOTI_TONE="/opt/share/settings/Alerts/General notification_sdk.wav"
-%endif
 
        vconftool $GOPTION set -t bool db/setting/sound/sound_on "1"
        vconftool $GOPTION set -t bool db/setting/sound/vibration_on "1"

diff --git a/setting-profile/include/setting-profile.h b/setting-profile/include/setting-profile.h
index fbdb8fe..10e92cc 100755 (executable)
--- a/setting-profile/include/setting-profile.h
+++ b/setting-profile/include/setting-profile.h
@@ -80,14 +80,12 @@ typedef enum {
 
 #define SETTING_DEFAULT_RINGTONE_PATH  "/opt/share/settings/Ringtones/"
 #define SETTING_DEFAULT_ALERT_PATH             "/opt/share/settings/Alerts/"
-#define SETTING_DEFAULT_PREVIEW_PATH   "/opt/share/settings/Previews/"
 #define SETTING_PROFILE_MMC_PATH               "/opt/storage/sdcard/"
 
-#define SETTING_DEFAULT_CALL_TONE              SETTING_DEFAULT_RINGTONE_PATH"Over the horizon.mp3"
-#define SETTING_DEFAULT_CALL_TONE_SDK  SETTING_DEFAULT_RINGTONE_PATH"ringtone_sdk.mp3"
-#define SETTING_DEFAULT_MSG_TONE               SETTING_DEFAULT_ALERT_PATH"Whistle.mp3"
+#define SETTING_DEFAULT_CALL_TONE              SETTING_DEFAULT_RINGTONE_PATH"ringtone_sdk.mp3"
+#define SETTING_DEFAULT_MSG_TONE               SETTING_DEFAULT_ALERT_PATH"General notification_sdk.wav"
 #define SETTING_DEFAULT_EMAIL_TONE             SETTING_DEFAULT_MSG_TONE
-#define SETTING_DEFAULT_MEDIA_TONE             SETTING_DEFAULT_PREVIEW_PATH"Over the horizon.mp3"
+#define SETTING_DEFAULT_MEDIA_TONE             SETTING_DEFAULT_CALL_TONE
 
 typedef struct _SettingProfileUG SettingProfileUG;
 

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index 29b5cf8..64f0d57 100755 (executable)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -402,10 +402,7 @@ void __volume_stop_change_cb(void *data, Evas_Object *obj, void *event_info)
                        pa_tone_path = vconf_get_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
                        if(pa_tone_path == NULL)
                        {
-                               if(isEmulBin())
-                                       pa_tone_path = SETTING_DEFAULT_CALL_TONE_SDK;
-                               else
-                                       pa_tone_path = SETTING_DEFAULT_CALL_TONE;
+                               pa_tone_path = SETTING_DEFAULT_CALL_TONE;
 
                                if(vconf_set_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, pa_tone_path) < 0)
                                        return;
@@ -439,10 +436,7 @@ void __volume_stop_change_cb(void *data, Evas_Object *obj, void *event_info)
                        if(*player != NULL)
                                return;
                        SETTING_TRACE_DEBUG("media player will be created");
-                       if(isEmulBin())
-                               pa_tone_path = (char*)strdup(SETTING_DEFAULT_CALL_TONE_SDK);
-                       else
-                               pa_tone_path = (char*)strdup(SETTING_DEFAULT_MEDIA_TONE);
+                       pa_tone_path = (char*)strdup(SETTING_DEFAULT_MEDIA_TONE);
 
                        setting_profile_play_sound_origin(player, ad, __mm_player_msg_cb,
                                                        pa_tone_path,
@@ -820,10 +814,7 @@ static Evas_Object *__get_ringtone_list(void *data)
        char *pa_ringtone = vconf_get_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
        if(setting_profile_check_file_exist(ad, pa_ringtone) == SETTING_RETURN_FAIL)
        {
-               if(isEmulBin())
-                       pa_ringtone = (char *)strdup(SETTING_DEFAULT_CALL_TONE_SDK);
-               else
-                       pa_ringtone = (char *)strdup(SETTING_DEFAULT_CALL_TONE);
+               pa_ringtone = (char *)strdup(SETTING_DEFAULT_CALL_TONE);
                vconf_ret = vconf_set_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, pa_ringtone);
                if(vconf_ret < 0)
                        SETTING_TRACE_DEBUG("failed to set vconf");
@@ -1286,10 +1277,7 @@ static void setting_profile_sound_main_create_myfile_ug(SettingProfileUG *ad)
                pa_cur_ringtone = vconf_get_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
                if (pa_cur_ringtone == NULL)
                {
-                       if(isEmulBin())
-                               pa_cur_ringtone = SETTING_DEFAULT_CALL_TONE_SDK;
-                       else
-                               pa_cur_ringtone = SETTING_DEFAULT_CALL_TONE;
+                       pa_cur_ringtone = SETTING_DEFAULT_CALL_TONE;
                }
                dir_path = SETTING_PROFILE_SOUND_RINGTONES_PATH;
        } else if (0 == safeStrCmp(ad->ringtone_type, SETTING_SOUND_TEXT_MSG_ALERT)) {

diff --git a/setting-profile/src/setting-profile.c b/setting-profile/src/setting-profile.c
index 11b9bc0..61713f9 100755 (executable)
--- a/setting-profile/src/setting-profile.c
+++ b/setting-profile/src/setting-profile.c
@@ -358,10 +358,7 @@ static void setting_profile_ug_on_resume(ui_gadget_h ug, service_h service, void
                pa_tone_path = vconf_get_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
                if((pa_tone_path == NULL) || (setting_profile_check_file_exist(profileUG, pa_tone_path) == SETTING_RETURN_FAIL))
                {
-                       if(isEmulBin())
-                               pa_tone_path = (char *)strdup(SETTING_DEFAULT_CALL_TONE_SDK);
-                       else
-                               pa_tone_path = (char *)strdup(SETTING_DEFAULT_CALL_TONE);
+                       pa_tone_path = (char *)strdup(SETTING_DEFAULT_CALL_TONE);
                        if(vconf_set_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, pa_tone_path) < 0)
                                return;
                        profileUG->data_call_alert_tone->sub_desc = setting_file_basename(pa_tone_path);
@@ -576,16 +573,10 @@ player_h *setting_profile_play_sound(void *data, void *cb,
                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);
+                               ad->song_playing = (char *)g_strdup(SETTING_DEFAULT_CALL_TONE);
                                break;
                        case SOUND_TYPE_MEDIA:
-                               if(isEmulBin())
-                                       ad->song_playing = (char *)g_strdup(SETTING_DEFAULT_CALL_TONE_SDK);
-                               else
-                                       ad->song_playing = (char *)g_strdup(SETTING_DEFAULT_MEDIA_TONE);
+                               ad->song_playing = (char *)g_strdup(SETTING_DEFAULT_MEDIA_TONE);
                                break;
                        case SOUND_TYPE_NOTIFICATION:
                                ad->song_playing = (char *)g_strdup(SETTING_DEFAULT_MSG_TONE);
@@ -596,10 +587,7 @@ player_h *setting_profile_play_sound(void *data, void *cb,
                                ad->song_playing = (char *)g_strdup(pattern_file);
                                break;
                        default:
-                               if(isEmulBin())
-                                       ad->song_playing = (char *)g_strdup(SETTING_DEFAULT_CALL_TONE_SDK);
-                               else
-                                       ad->song_playing = (char *)g_strdup(SETTING_DEFAULT_CALL_TONE);
+                               ad->song_playing = (char *)g_strdup(SETTING_DEFAULT_CALL_TONE);
                                break;
                }
 
@@ -953,10 +941,7 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
        ret += vconf_set_int(VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT, SETTING_DEFAULT_HAPTIC_VIB_INT);
        ret += vconf_set_int(VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_BAK_INT, SETTING_DEFAULT_HAPTIC_VIB_INT);
 
-       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);
+       ret += vconf_set_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, SETTING_DEFAULT_CALL_TONE);
 
        ret += vconf_set_int(VCONFKEY_SETAPPL_CALL_VIBRATION_PATTERN_INT, SETTING_CALL_ALERT_VIB_TYPE3);