Fix build error of haptic

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 58f2b95..03abcdb 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -12,7 +12,7 @@ BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(tapi)
 BuildRequires:  pkgconfig(utilX)
 BuildRequires:  pkgconfig(devman)
-BuildRequires:  pkgconfig(devman_haptic)
+BuildRequires:  pkgconfig(haptic)
 BuildRequires:  pkgconfig(bluetooth-api)
 BuildRequires:  pkgconfig(mm-sound)
 BuildRequires:  pkgconfig(openssl)
@@ -58,7 +58,6 @@ BuildRequires:  pkgconfig(capi-system-device)
 BuildRequires:  pkgconfig(capi-appfw-application)
 BuildRequires:  pkgconfig(capi-appfw-app-manager)
 BuildRequires:  pkgconfig(capi-system-sensor)
-BuildRequires:  pkgconfig(capi-system-haptic)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(capi-system-system-settings)
 BuildRequires:  pkgconfig(capi-network-bluetooth)

diff --git a/setting-phone/CMakeLists.txt b/setting-phone/CMakeLists.txt
index f8a748a..91caea3 100755 (executable)
--- a/setting-phone/CMakeLists.txt
+++ b/setting-phone/CMakeLists.txt
@@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_phone REQUIRED evas eina ecore elementary appcore-common appcore-efl devman_haptic heynoti  tapi ui-gadget-1 capi-appfw-application appsvc libxml-2.0)
+pkg_check_modules(pkgs_phone REQUIRED evas eina ecore elementary appcore-common appcore-efl haptic heynoti  tapi ui-gadget-1 capi-appfw-application appsvc libxml-2.0)
 
 FOREACH(flag ${pkgs_phone_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-profile/CMakeLists.txt b/setting-profile/CMakeLists.txt
index c752534..07259d8 100755 (executable)
--- a/setting-profile/CMakeLists.txt
+++ b/setting-profile/CMakeLists.txt
@@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_profile REQUIRED ecore ecore-file evas elementary utilX appcore-common appcore-efl haptic ui-gadget-1 capi-appfw-application vconf capi-media-player capi-media-sound-manager dlog svi devman capi-system-device
+pkg_check_modules(pkgs_profile REQUIRED ecore ecore-file evas elementary utilX appcore-common appcore-efl haptic ui-gadget-1 capi-appfw-application vconf capi-media-player capi-media-sound-manager dlog svi devman capi-system-device)
 
 FOREACH(flag ${pkgs_profile_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-profile/include/setting-profile.h b/setting-profile/include/setting-profile.h
index fe94f8d..a87e98b 100755 (executable)
--- a/setting-profile/include/setting-profile.h
+++ b/setting-profile/include/setting-profile.h
@@ -100,6 +100,8 @@ typedef enum {
 #define SETTING_DEFAULT_EMAIL_TONE             SETTING_DEFAULT_MSG_TONE
 #define SETTING_DEFAULT_MEDIA_TONE             SETTING_DEFAULT_CALL_TONE
 
+#define SETTING_VIB_FEEDBACK_RATE              20
+
 typedef struct _SettingProfileUG SettingProfileUG;
 
 /**

diff --git a/setting-profile/src/setting-profile.c b/setting-profile/src/setting-profile.c
index 4d7c5de..addc336 100755 (executable)
--- a/setting-profile/src/setting-profile.c
+++ b/setting-profile/src/setting-profile.c
@@ -246,10 +246,7 @@ static void setting_profile_vconf_change_cb(keynode_t *key, void *data)
                pa_ringtone = vconf_keynode_get_str(key);
                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);
                        ret = vconf_set_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR, pa_ringtone);
                        if(ret < 0)
                                SETTING_TRACE_DEBUG("failed to set vconf");