fix cmake error and vibration issue

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 461cebc..ded09d1 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,21 +56,21 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_COMMON})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_STORAGE})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_STORAGE})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PHONE})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_CONNECTIVITY})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_CONNECTIVITY})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_DISPLAY})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_MEMORY})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_NETWORK})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PROFILE})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_RESET})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_SECURITY})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_TIME})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_MEMORY})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_NETWORK})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PROFILE})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_RESET})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_SECURITY})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_TIME})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_ABOUT})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PASSWORD})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_MENUSCREEN})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_POWERSAVING})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FONT})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FILEVIEW})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PASSWORD})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_MENUSCREEN})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_POWERSAVING})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FONT})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FILEVIEW})
 ADD_SUBDIRECTORY(src)
 

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index d30dff5..8f6505b 100755 (executable)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -456,7 +456,7 @@ void __vibration_stop_change_cb(void *data, Evas_Object *obj, void *event_info)
                SETTING_TRACE("ERROR haptic_stop_all_effects");
                /* return; */
        }
-
+#if DISABLED_CODE
        double value = 0.0;
        switch(ad->cur_vol_type)
        {
@@ -464,19 +464,21 @@ void __vibration_stop_change_cb(void *data, Evas_Object *obj, void *event_info)
                        if(ad->data_vib_volume)
                        {
                                value = elm_slider_value_get(ad->data_vib_volume->eo_check);
-                               vconf_set_int(VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT, (unsigned int)(value+0.5));
+                               list_item->chk_status = (int)(value + 0.5);
+                               vconf_set_int(VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT, list_item->chk_status);
                                if(value < 0.5)
                                        elm_slider_value_set(ad->data_vib_volume->eo_check, 0);
                                else
-                                       elm_slider_value_set(ad->data_vib_volume->eo_check, (unsigned int)(value+0.5));
+                                       elm_slider_value_set(ad->data_vib_volume->eo_check, list_item->chk_status);
                        }
                        break;
                case SETTING_VOL_TYPE_HAPTIC_VIB:
                        if(ad->data_touch_vib)
                        {
                                value = elm_slider_value_get(ad->data_touch_vib->eo_check);
-                               vconf_set_int(VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT, (unsigned int)(value+0.5));
-                               vconf_set_int(VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_BAK_INT, (unsigned int)(value+0.5));
+                               list_item->chk_status = (int)(value + 0.5);
+                               vconf_set_int(VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT, list_item->chk_status);
+                               vconf_set_int(VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_BAK_INT, list_item->chk_status);
                                if(value < 0.5)
                                        elm_slider_value_set(ad->data_touch_vib->eo_check, 0);
                                else
@@ -486,6 +488,7 @@ void __vibration_stop_change_cb(void *data, Evas_Object *obj, void *event_info)
                default:
                        break;
        }
+#endif
        ad->cur_vol_type = SETTING_VOL_TYPE_MAX;
        SETTING_TRACE_END;
 }
@@ -790,7 +793,7 @@ static Evas_Object *__get_main_list(void *data)
 
        __change_state_of_sliderbars(ad);
 
-       evas_object_smart_callback_add(genlist, "unrealized", __main_list_unrealized_cb, ad);
+       //evas_object_smart_callback_add(genlist, "unrealized", __main_list_unrealized_cb, ad);
 
        ad->sub_view[SETTING_PROF_VIEW_VOL] = genlist;
 
@@ -1581,6 +1584,7 @@ setting_profile_sound_main_vib_sound_slider_value_change_cb(void *data,
                                                            Evas_Object *obj,
                                                            void *event_info)
 {
+       SETTING_TRACE_BEGIN;
        /* error check */
        ret_if(data == NULL);
 
@@ -1597,7 +1601,8 @@ setting_profile_sound_main_vib_sound_slider_value_change_cb(void *data,
        value = (int)(val + 0.5);       /*  to sync displayed value on slider */
        list_item->chk_status = value;
        if (value != priv_val_int) {
-               vconf_set_int(VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT, list_item->chk_status);
+               vconf_set_int(VCONFKEY_SETAPPL_NOTI_VIBRATION_LEVEL_INT, value);
+               SETTING_TRACE_DEBUG("current %d", value);
                char pattern_file[MAX_COMMON_BUFFER_LEN] = {0,};
                svi_get_path(SVI_TYPE_VIB, SVI_VIB_NOTIFICATION_GENERAL, pattern_file, sizeof(pattern_file));
                haptic_stop_all_effects(ad->hnd_hpt);
@@ -1617,6 +1622,7 @@ setting_profile_sound_main_touchVib_sound_slider_value_change_cb(void *data,
                                                                 obj, void
                                                                 *event_info)
 {
+       SETTING_TRACE_BEGIN;
        /* error check */
        ret_if(data == NULL);
 
@@ -1634,7 +1640,8 @@ setting_profile_sound_main_touchVib_sound_slider_value_change_cb(void *data,
        value = (int)(val + 0.5);       /*  to sync displayed value on slider */
        list_item->chk_status = value;
        if (value != priv_val_int) {
-               vconf_set_int (VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT, list_item->chk_status);
+               vconf_set_int(VCONFKEY_SETAPPL_TOUCH_FEEDBACK_VIBRATION_LEVEL_INT, value);
+               SETTING_TRACE_DEBUG("current %d", value);
                char pattern_file[MAX_COMMON_BUFFER_LEN] = {0,};
                svi_get_path(SVI_TYPE_VIB, SVI_VIB_OPERATION_VIBRATION, pattern_file, sizeof(pattern_file));
                haptic_stop_all_effects(ad->hnd_hpt);