Fix some errors

* remove automatic codes
* add pkginfo sub directory
* add security-privilege-manager

Change-Id: Id064e1c21e093c71d3270c9958f1772a3dce77c4
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64a50a841f99e3b21d42c4e258dd4eb368c3e434..152fcbb5ba07c4c6a5ddeba01f756c570dcd9692 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,3 +99,4 @@ ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_TIME})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_ABOUT})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FONT})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_RINGTONE})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_APPMGR})

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 09313c309f9e68e9d5648461a5f62341df77d956..b207917ba40e5db42d5ab556e888716189fe46b6 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -95,12 +95,12 @@ BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(callmgr_client)
 BuildRequires:  pkgconfig(privilege-info)
+BuildRequires:  pkgconfig(security-privilege-manager)
 BuildRequires:  libcap-devel
 BuildRequires:  cmake
 BuildRequires:  edje-tools
 BuildRequires:  gettext-tools
 BuildRequires:  hash-signer
-Requires: security-privilege-manager
 Requires(post): attr
 
 %description

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index 7b6149ffde344b5aa1b02abbf14d15de52a76890..c43fe068d97253eaec99f7db6ecbf247ff3dff4a 100644 (file)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -1205,34 +1205,6 @@ setting_time_main_chk_btn_cb(void *data, Evas_Object *obj, void *event_info)
        ad = list_item->userdata;
        list_item->chk_status = elm_check_state_get(obj);       /*      for genlist update status */
 
-       int err;
-       if (obj == ad->data_auto->eo_check) {
-               int bvalue;
-               setting_get_bool_slp_key(BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE,
-                                                                &bvalue, &err);
-               if (bvalue) {
-                       (void) setting_set_bool_slp_key(BOOL_SLP_SETTING_AUTOMATIC_TIME_UPDATE, SETTING_ON_OFF_BTN_OFF, &err);
-                       setting_update_gl_item_chk_status(ad->data_auto, 0);
-
-                       if (ad->data_tz) {
-                               setting_enable_genlist_item(ad->data_tz->item);
-                       }
-
-                       if (ad->data_time) {
-                               ad->data_time->isItemDisableFlag = FALSE;
-                               /*setting_disable_evas_object(ad->data_time->eo_check); */
-                               setting_enable_evas_object(ad->data_time->btn_left);
-                               setting_enable_evas_object(ad->data_time->btn_right);
-                               setting_enable_genlist_item(ad->data_time->item);
-                       }
-               } else {
-                       __time_auto_update(ad);
-               }
-       }
-
-
-
-       /*#define FUNCTION_SYSTEM_SETTING 1 */
 #if FUNCTION_SYSTEM_SETTING
        /* Time format */
        if (ad->data_time_fmt == list_item) {