summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjinwang.an <jinwang.an@samsung.com>2018-12-17 16:48:39 +0900
committerjinwang.an <jinwang.an@samsung.com>2018-12-17 16:48:39 +0900
commitb34c0659704e7ca194f8735626ab9e9d2a59b158 (patch)
tree57ecdea3830759dfedfd53cb4ddff78b9f87a372
parent65b1d437ed278ac1139dcc15961b1ebf8928e5b4 (diff)
downloadwatch-setting-b34c0659704e7ca194f8735626ab9e9d2a59b158.tar.gz
watch-setting-b34c0659704e7ca194f8735626ab9e9d2a59b158.tar.bz2
watch-setting-b34c0659704e7ca194f8735626ab9e9d2a59b158.zip
Change-Id: Ia1ff7e2e32ee0b92fde073b6c1ce6a4a26c8f4fe Signed-off-by: jinwang.an <jinwang.an@samsung.com>
-rw-r--r--src/setting-clock.c2
-rw-r--r--src/setting-datausage.c8
-rw-r--r--src/setting-mobile-networks.c11
3 files changed, 12 insertions, 9 deletions
diff --git a/src/setting-clock.c b/src/setting-clock.c
index a7a04c1..7c410ec 100644
--- a/src/setting-clock.c
+++ b/src/setting-clock.c
@@ -1865,7 +1865,7 @@ static void _clock_gl_watch_always_on_cb(void *data, Evas_Object *obj, void *eve
} else {
/* disable watch always off with out popup */
- DBG("Cancel watch always on!", ambient_mode);
+ DBG("Cancel watch always on!");
vconf_set_bool(VCONFKEY_SETAPPL_AMBIENT_MODE_BOOL, !ambient_mode);
elm_check_state_set(check, EINA_FALSE);
}
diff --git a/src/setting-datausage.c b/src/setting-datausage.c
index dc15ee6..ccbe38e 100644
--- a/src/setting-datausage.c
+++ b/src/setting-datausage.c
@@ -838,8 +838,8 @@ static void _set_stats_time_frame_from_cycle(Data_Limits_T *limits)
static stc_callback_ret_e _total_stats_cb(stc_error_e result,
stc_stats_info_h info, void *user_data)
{
- int64_t incoming = 0;
- int64_t outgoing = 0;
+ long long int incoming = 0;
+ long long int outgoing = 0;
char *subscriber_id = NULL;
const char *subscriber_id_to_look_for = user_data;
int ret = STC_ERROR_NONE;
@@ -1192,8 +1192,8 @@ static stc_callback_ret_e _get_and_unset_limit_restrictions_cb(
int ret = STC_ERROR_NONE;
char *app_id = NULL;
char *subscriber_id = NULL;
- int64_t limit = 0;
- int64_t warning_limit = 0;
+ long long int limit = 0;
+ long long int warning_limit = 0;
stc_iface_type_e iface_type = STC_IFACE_UNKNOWN;
stc_restriction_type_e type = STC_RSTN_TYPE_UNKNOWN;
stc_restriction_rule_h mobile_rule = NULL;
diff --git a/src/setting-mobile-networks.c b/src/setting-mobile-networks.c
index adc3643..50131ec 100644
--- a/src/setting-mobile-networks.c
+++ b/src/setting-mobile-networks.c
@@ -547,7 +547,8 @@ Evas_Object *_gl_mobile_networks_check_get(void *data, Evas_Object *obj, const c
mobile_networks_Item_Data *id = data;
int index = id->index;
- bool is_value = 0;
+ bool is_data_network = 0;
+ int is_roaming = 0;
int ret = 0;
if (!strcmp(part, "elm.icon")) {
@@ -556,23 +557,24 @@ Evas_Object *_gl_mobile_networks_check_get(void *data, Evas_Object *obj, const c
switch (index) {
case 0:
g_mobile_data_check = check;
- system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_3G_DATA_NETWORK_ENABLED, &is_value);
+ system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_3G_DATA_NETWORK_ENABLED, &is_data_network);
evas_object_event_callback_add(check, EVAS_CALLBACK_MOUSE_DOWN, _mobile_data_check_cb, (void *)check);
+ elm_check_state_set(check, (is_data_network) ? EINA_TRUE : EINA_FALSE); /*default */
break;
case 1:
g_data_roaming_check = check;
- ret = vconf_get_bool(VCONFKEY_SETAPPL_STATE_DATA_ROAMING_BOOL, &is_value);
+ ret = vconf_get_bool(VCONFKEY_SETAPPL_STATE_DATA_ROAMING_BOOL, &is_roaming);
if (ret < 0) {
ERR("Setting VCONFKEY_SETAPPL_STATE_DATA_ROAMING_BOOL failed!");
}
evas_object_event_callback_add(check, EVAS_CALLBACK_MOUSE_DOWN, _data_roaming_check_cb, (void *)check);
+ elm_check_state_set(check, (is_roaming) ? EINA_TRUE : EINA_FALSE); /*default */
break;
default:
ERR("Error!! another value came in this func. index = %d", index);
break;
}
- elm_check_state_set(check, (is_value) ? EINA_TRUE : EINA_FALSE); /*default */
elm_object_style_set(check, "on&off");
evas_object_size_hint_align_set(check, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1239,6 +1241,7 @@ static void _mobile_networks_mode_gl_cb(void *data, Evas_Object *obj, void *even
return;
}
g_network_mode = network_mode;
+ elm_genlist_realized_items_update(g_mobile_networks_genlist);
}
elm_naviframe_item_pop(g_app_context->nf);