[TBT][system-settings][Time changed key fixed]

Change-Id: I9d9aa246f72a483ca178a308eaada734389afb9b
Signed-off-by: so2.park <so2.park@samsung.com>

diff --git a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk
index c905926503634fb0cdaa7e10049b1af7bb113c84..1cddde192c940d06b4114b5140460ecaa2b2fcc8 100644 (file)
Binary files a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk
index dfe87a64a75334ff9d169c2c67523bb02896c530..b4b11de1ff8b33a977a4523c8a90143bc807b06b 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk differ

diff --git a/tbtcoreapp/src/view/tbt-bluetoothle-view.c b/tbtcoreapp/src/view/tbt-bluetoothle-view.c
index 0baaf0262cb340f2480fb5f8f8d6170a6293db26..6e4f724a8df98c48ab1c61ce089d6a16c4afd5b6 100644 (file)
--- a/tbtcoreapp/src/view/tbt-bluetoothle-view.c
+++ b/tbtcoreapp/src/view/tbt-bluetoothle-view.c
@@ -1904,7 +1904,7 @@ static void _bt_gatt_server_read_value_requested_cb(const char *remote_address,
 
        char char_value_1[4] = {65, 66, 67,0};
        int resp_status = BT_ERROR_NONE;
-       int result = bt_gatt_server_send_response(request_id, BLUETOOTH_GATT_REQUEST_TYPE_READ, offset, resp_status, char_value_1, 3 - offset);
+       int result = bt_gatt_server_send_response(request_id, BT_GATT_REQUEST_TYPE_READ, offset, resp_status, char_value_1, 3 - offset);
        DBG("bt_gatt_server_send_response %s", get_bluetooth_error(result));
 
        str = format_string("response sent %s", char_value_1);
@@ -1964,7 +1964,7 @@ static void _bt_gatt_server_write_value_requested_cb(const char *remote_address,
        SAFE_DELETE(str);
 
        bt_gatt_server_send_response(request_id,
-                       BLUETOOTH_GATT_REQUEST_TYPE_WRITE, offset,
+                       BT_GATT_REQUEST_TYPE_WRITE, offset,
                resp_status, NULL, 0);
 
        elm_list_go(this->bluetoothle_list);

diff --git a/tbtcoreapp/src/view/tbt-systemsettings-view.c b/tbtcoreapp/src/view/tbt-systemsettings-view.c
index a5dc5d51826829b2eab10e6856a14852e9272bbb..213fa2cb2242ba1decd86cb41da85bfc40d0350b 100755 (executable)
--- a/tbtcoreapp/src/view/tbt-systemsettings-view.c
+++ b/tbtcoreapp/src/view/tbt-systemsettings-view.c
@@ -107,6 +107,7 @@ systemsettings_view *systemsettings_view_add(Evas_Object *navi, tbt_info *tbt_in
 {
        RETVM_IF(NULL == navi, NULL, "navi is null");
        int ret, value;
+       int timevalue = 0;
        bool bvalue;
        systemsettings_view *this = NULL;
        this = calloc(1, sizeof(systemsettings_view));
@@ -204,26 +205,23 @@ systemsettings_view *systemsettings_view_add(Evas_Object *navi, tbt_info *tbt_in
                ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_TIME_CHANGED, _system_settings_time_changed_changed_cb, this);
                RETVM_IF(ret != SYSTEM_SETTINGS_ERROR_NONE && ret != SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED, NULL, "system_settings_set_changed_cb failed : %s", get_system_settings_error(ret));
 
-               this->create_label = ui_utils_label_add(this->view->layout, "Key Font Size: ");
+               this->create_label = ui_utils_label_add(this->view->layout, "Time Changed Key : ");
                elm_label_line_wrap_set(this->create_label, ELM_WRAP_WORD);
 
-               ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_TIME_CHANGED, &value);
+               ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_TIME_CHANGED, &timevalue);
                RETVM_IF(ret != SYSTEM_SETTINGS_ERROR_NONE && ret != SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED, NULL, "system_settings_get_value_bool failed: %s",get_system_settings_error(ret));
+               
+               timevalue =0;
+               DBG("Time value: %d", timevalue);
 
-               DBG("value: %d", bvalue);
-
-               switch(value)
+               switch(timevalue)
                {
                        case 0:
                                ui_utils_label_set_text(this->create_label, "Time unchanged", "left");
                                break;
 
-                       case 1:
-                               ui_utils_label_set_text(this->create_label, "Time changed", "left");
-                               break;
-
                        default:
-                               ui_utils_label_set_text(this->create_label, "System Time Unknown status", "left");
+                               ui_utils_label_set_text(this->create_label, "Time changed", "left");
                                break;
 
                }
@@ -586,25 +584,22 @@ void _system_settings_time_changed_changed_cb(system_settings_key_e key, void *u
 {
 
        RETM_IF(NULL == user_data, "user_data is null");
-       int ret, value;
+       int ret;
+       int timevalue = 0;
        systemsettings_view *this = NULL;
     this = (systemsettings_view*) user_data;
 
-    ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_TIME_CHANGED, &value);
+    ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_TIME_CHANGED, &timevalue);
     RETM_IF(ret != SYSTEM_SETTINGS_ERROR_NONE && ret != SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED, "system_settings_get_value_int failed: %s",get_system_settings_error(ret));
-
-       switch(value)
+       DBG("In callback, Time changed value: %d", timevalue);
+       switch(timevalue)
        {
                case 0:
                        ui_utils_label_set_text(this->create_label, "Time unchanged", "left");
                        break;
 
-               case 1:
-                       ui_utils_label_set_text(this->create_label, "Time changed", "left");
-                       break;
-
                default:
-                       ui_utils_label_set_text(this->create_label, "System Time Unknown status", "left");
+                       ui_utils_label_set_text(this->create_label, "Time changed", "left");
                        break;
 
                }