From cf3721d7d335ded9c7160e5e39cd1c18fbe5aa13 Mon Sep 17 00:00:00 2001 From: hyunuktak Date: Fri, 2 Dec 2016 15:35:07 +0900 Subject: [PATCH] Fix to change the value after turn on/off static IP Change-Id: I4de6effc8a50b3617ed9c560a101513762b7f554 Signed-off-by: hyunuktak --- packaging/wifi-efl-ug.spec | 2 +- sources/libraries/Common/common_ip_info.c | 63 +++++++++++----------- .../WlanManager/WlanManager/wlan_manager.c | 1 - 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec index ef2dc90..4bba8c7 100644 --- a/packaging/wifi-efl-ug.spec +++ b/packaging/wifi-efl-ug.spec @@ -1,7 +1,7 @@ %define _unpackaged_files_terminate_build 0 Name: wifi-efl-ug Summary: Wi-Fi UI Gadget for TIZEN -Version: 1.0.219 +Version: 1.0.220 Release: 1 Group: App/Network License: Flora-1.1 diff --git a/sources/libraries/Common/common_ip_info.c b/sources/libraries/Common/common_ip_info.c index 051f257..90d264b 100755 --- a/sources/libraries/Common/common_ip_info.c +++ b/sources/libraries/Common/common_ip_info.c @@ -37,9 +37,9 @@ typedef struct { static Elm_Object_Item* _add_description(Evas_Object* genlist, char* title, char* description, Elm_Object_Item* insert_after); -static Elm_Genlist_Item_Class ip_toggle_itc ; -static Elm_Genlist_Item_Class description_itc ; -static Elm_Genlist_Item_Class ip_entry_itc; +static Elm_Genlist_Item_Class *ip_toggle_itc ; +static Elm_Genlist_Item_Class *description_itc ; +static Elm_Genlist_Item_Class *ip_entry_itc; static Evas_Object *curr_unfocus_entry = NULL; static int curr_unfocuc_cursor_pos = 0; static char *ip_info_text_list[ENTRY_TYPE_MAX]; @@ -690,7 +690,7 @@ static void _create_static_ip_table(full_ip_info_t *ip_data) edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb; edit_box_details->input_panel_cb_data = ip_info_list_data->input_panel_cb_data; edit_box_details->item = elm_genlist_item_insert_after( - ip_info_list_data->genlist, &ip_entry_itc, + ip_info_list_data->genlist, ip_entry_itc, edit_box_details, NULL, ip_info_list_data->ip_toggle_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL); #ifdef ACCESSIBLITY_FEATURE @@ -725,7 +725,7 @@ static void _create_static_ip_table(full_ip_info_t *ip_data) edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb; edit_box_details->input_panel_cb_data = ip_info_list_data->input_panel_cb_data; edit_box_details->item = elm_genlist_item_insert_after( - ip_info_list_data->genlist, &ip_entry_itc, + ip_info_list_data->genlist, ip_entry_itc, edit_box_details, NULL, ip_info_list_data->ip_addr_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL); #ifdef ACCESSIBLITY_FEATURE @@ -756,7 +756,7 @@ static void _create_static_ip_table(full_ip_info_t *ip_data) edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb; edit_box_details->input_panel_cb_data = ip_info_list_data->input_panel_cb_data; edit_box_details->item = elm_genlist_item_insert_after( - ip_info_list_data->genlist, &ip_entry_itc, + ip_info_list_data->genlist, ip_entry_itc, edit_box_details, NULL, ip_info_list_data->subnet_mask_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL); #ifdef ACCESSIBLITY_FEATURE @@ -787,7 +787,7 @@ static void _create_static_ip_table(full_ip_info_t *ip_data) edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb; edit_box_details->input_panel_cb_data = ip_info_list_data->input_panel_cb_data; edit_box_details->item = elm_genlist_item_insert_after( - ip_info_list_data->genlist, &ip_entry_itc, + ip_info_list_data->genlist, ip_entry_itc, edit_box_details, NULL, ip_info_list_data->gateway_addr_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL); #ifdef ACCESSIBLITY_FEATURE @@ -818,7 +818,7 @@ static void _create_static_ip_table(full_ip_info_t *ip_data) edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb; edit_box_details->input_panel_cb_data = ip_info_list_data->input_panel_cb_data; edit_box_details->item = elm_genlist_item_insert_after( - ip_info_list_data->genlist, &ip_entry_itc, + ip_info_list_data->genlist, ip_entry_itc, edit_box_details, NULL, ip_info_list_data->dns_1_item, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL); #ifdef ACCESSIBLITY_FEATURE @@ -927,7 +927,7 @@ static Elm_Object_Item* _add_description(Evas_Object* genlist, char* title, if (insert_after) { det = elm_genlist_item_insert_after( genlist, /*obj*/ - &description_itc,/*itc*/ + description_itc,/*itc*/ description_data,/*data*/ NULL,/*parent*/ insert_after, /*after than*/ @@ -937,7 +937,7 @@ static Elm_Object_Item* _add_description(Evas_Object* genlist, char* title, } else { det = elm_genlist_item_append( genlist, - &description_itc, + description_itc, description_data, NULL, ELM_GENLIST_ITEM_NONE, @@ -1234,23 +1234,26 @@ full_ip_info_t *ip_info_append_items(wifi_ap_h ap, const char *pkg_name, ip_info_list_data->input_panel_cb = input_panel_cb; ip_info_list_data->input_panel_cb_data = input_panel_cb_data; - ip_toggle_itc.item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE; - ip_toggle_itc.func.text_get = _ip_info_iptoggle_text_get; - ip_toggle_itc.func.content_get = _ip_info_iptoggle_content_get; - ip_toggle_itc.func.state_get = NULL; - ip_toggle_itc.func.del = NULL; - - description_itc.item_style = WIFI_GENLIST_FULL_STYLE; - description_itc.func.text_get = _ip_info_detail_description_text_get; - description_itc.func.content_get = _ip_info_detail_description_content_get; - description_itc.func.state_get = NULL; - description_itc.func.del = _ip_info_detail_description_del; - - ip_entry_itc.item_style = WIFI_GENLIST_FULL_STYLE; - ip_entry_itc.func.text_get = _ip_info_entry_item_text_get; - ip_entry_itc.func.content_get = _ip_info_entry_item_content_get; - ip_entry_itc.func.state_get = NULL; - ip_entry_itc.func.del = _ip_info_entry_item_del; + ip_toggle_itc = elm_genlist_item_class_new(); + ip_toggle_itc->item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE; + ip_toggle_itc->func.text_get = _ip_info_iptoggle_text_get; + ip_toggle_itc->func.content_get = _ip_info_iptoggle_content_get; + ip_toggle_itc->func.state_get = NULL; + ip_toggle_itc->func.del = NULL; + + description_itc = elm_genlist_item_class_new(); + description_itc->item_style = WIFI_GENLIST_FULL_STYLE; + description_itc->func.text_get = _ip_info_detail_description_text_get; + description_itc->func.content_get = _ip_info_detail_description_content_get; + description_itc->func.state_get = NULL; + description_itc->func.del = _ip_info_detail_description_del; + + ip_entry_itc = elm_genlist_item_class_new(); + ip_entry_itc->item_style = WIFI_GENLIST_FULL_STYLE; + ip_entry_itc->func.text_get = _ip_info_entry_item_text_get; + ip_entry_itc->func.content_get = _ip_info_entry_item_content_get; + ip_entry_itc->func.state_get = NULL; + ip_entry_itc->func.del = _ip_info_entry_item_del; elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS); @@ -1262,7 +1265,7 @@ full_ip_info_t *ip_info_append_items(wifi_ap_h ap, const char *pkg_name, ip_info_list_data->ip_type = type; ip_info_list_data->ip_toggle_item = elm_genlist_item_append(genlist, - &ip_toggle_itc, ip_data, NULL, ELM_GENLIST_ITEM_NONE, + ip_toggle_itc, ip_data, NULL, ELM_GENLIST_ITEM_NONE, __ip_info_toggle_item_sel_cb, ip_data); prev_ip_info->ip_type = type; @@ -1366,7 +1369,7 @@ full_ip_info_t *ip_info_append_items(wifi_ap_h ap, const char *pkg_name, edit_box_details->guide_txt = DEFAULT_GUIDE_PROXY_IP; edit_box_details->input_panel_cb = input_panel_cb; edit_box_details->input_panel_cb_data = input_panel_cb_data; - edit_box_details->item = elm_genlist_item_append(genlist, &ip_entry_itc, + edit_box_details->item = elm_genlist_item_append(genlist, ip_entry_itc, edit_box_details, NULL, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL); #ifdef ACCESSIBLITY_FEATURE @@ -1383,7 +1386,7 @@ full_ip_info_t *ip_info_append_items(wifi_ap_h ap, const char *pkg_name, edit_box_details->guide_txt = DEFAULT_GUIDE_PROXY_PORT; edit_box_details->input_panel_cb = input_panel_cb; edit_box_details->input_panel_cb_data = input_panel_cb_data; - edit_box_details->item = elm_genlist_item_append(genlist, &ip_entry_itc, + edit_box_details->item = elm_genlist_item_append(genlist, ip_entry_itc, edit_box_details, NULL, ELM_GENLIST_ITEM_NONE, _gl_editbox_sel_cb, NULL); #ifdef ACCESSIBLITY_FEATURE diff --git a/sources/libraries/WlanManager/WlanManager/wlan_manager.c b/sources/libraries/WlanManager/WlanManager/wlan_manager.c index 661191f..0fe7208 100755 --- a/sources/libraries/WlanManager/WlanManager/wlan_manager.c +++ b/sources/libraries/WlanManager/WlanManager/wlan_manager.c @@ -864,7 +864,6 @@ void wlan_manager_scanned_profile_refresh(void) if (FALSE == manager_object->b_scan_blocked) manager_object->refresh_func(); else - manager_object->refresh_func(); manager_object->b_ui_refresh = TRUE; __COMMON_FUNC_EXIT__; -- 2.7.4