From: hyunuktak Date: Mon, 17 Aug 2015 05:40:20 +0000 (+0900) Subject: Sync with Tizen 2.4 #2 X-Git-Tag: accepted/tizen/mobile/20150817.134054^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e92b7cb0522d2746a74d37a48068b8e9b8187e2;p=apps%2Fnative%2Fug-wifi-efl.git Sync with Tizen 2.4 #2 Signed-off-by: hyunuktak Change-Id: Ie1d8bd472e57523fcff35b0a27f331f463b0fe35 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 30127fa..f9c7238 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ SET(ENGINE_PKGCONFIGS capi-network-wifi network) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wmissing-declarations") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wmissing-declarations") IF(TIZEN_TETHERING_ENABLE) ADD_DEFINITIONS(-DTIZEN_TETHERING_ENABLE) @@ -26,7 +26,6 @@ ENDIF(MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE) INCLUDE(FindPkgConfig) pkg_check_modules(pkgs REQUIRED ecore - ecore-x ecore-imf ecore-input appcore-efl @@ -34,9 +33,7 @@ pkg_check_modules(pkgs REQUIRED efl-assist capi-ui-efl-util glib-2.0 - utilX ui-gadget-1 - x11 capi-network-connection capi-network-wifi sensor diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec index 7b560fe..b4fcb66 100644 --- a/packaging/wifi-efl-ug.spec +++ b/packaging/wifi-efl-ug.spec @@ -20,9 +20,7 @@ BuildRequires: pkgconfig(efl-assist) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(cert-svc-vcore) -BuildRequires: pkgconfig(utilX) BuildRequires: pkgconfig(ui-gadget-1) -BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(sensor) BuildRequires: pkgconfig(capi-network-wifi) BuildRequires: pkgconfig(capi-network-connection) @@ -36,7 +34,6 @@ BuildRequires: pkgconfig(efl-extension) BuildRequires: cmake BuildRequires: gettext-tools BuildRequires: edje-tools -BuildRequires: model-build-features Requires(post): /sbin/ldconfig Requires(post): /usr/bin/vconftool requires(postun): /sbin/ldconfig diff --git a/sources/libraries/Common/common_eap_connect.c b/sources/libraries/Common/common_eap_connect.c index 7c3b678..75b3b2f 100755 --- a/sources/libraries/Common/common_eap_connect.c +++ b/sources/libraries/Common/common_eap_connect.c @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include #include #include @@ -345,9 +343,6 @@ static void _gl_eap_type_sub_sel(void *data, Evas_Object *obj, void *event_info) elm_genlist_item_update(eap_data->eap_type_item); } -static CertSvcStringList stringList; -static CertSvcInstance instance; - static void _gl_eap_user_cert_sel(void *data, Evas_Object *obj, void *event_info) { @@ -400,8 +395,6 @@ static void _gl_eap_user_cert_sel(void *data, Evas_Object *obj, static void _create_eap_cert_list(eap_connect_data_t *eap_data, Evas_Object *btn) { - int list_length = 0; - int index = 0; Evas_Object *ctxpopup; Elm_Object_Item *it = NULL; @@ -426,14 +419,6 @@ static void _create_eap_cert_list(eap_connect_data_t *eap_data, ELM_CTXPOPUP_DIRECTION_UNKNOWN, ELM_CTXPOPUP_DIRECTION_UNKNOWN); - if (certsvc_instance_new(&instance) == CERTSVC_FAIL) { - INFO_LOG(UG_NAME_ERR, "Failed to create new instance"); - return; - } - - certsvc_pkcs12_get_id_list(instance, &stringList); - certsvc_string_list_get_length(stringList, &list_length); - if (eap_data->cert_candidates) { g_slist_free_full(eap_data->cert_candidates, g_free); eap_data->cert_candidates = NULL; @@ -444,30 +429,8 @@ static void _create_eap_cert_list(eap_connect_data_t *eap_data, elm_object_item_domain_text_translatable_set(it, PACKAGE, EINA_TRUE); - for (index = 0; index < list_length; index++) { - char *char_buffer = NULL; - CertSvcString buffer; - int ret = certsvc_string_list_get_one(stringList, index, &buffer); - if (ret == CERTSVC_SUCCESS) { - char_buffer = g_strndup(buffer.privateHandler, buffer.privateLength); - if (char_buffer == NULL) - goto exit; - - elm_ctxpopup_item_append(ctxpopup, char_buffer, NULL, - _gl_eap_user_cert_sel, eap_data); - eap_data->cert_candidates = - g_slist_prepend(eap_data->cert_candidates, char_buffer); - - certsvc_string_free(buffer); - } else - ERROR_LOG(UG_NAME_NORMAL, "Failed to get certificates"); - } - move_dropdown(eap_data, btn); evas_object_show(ctxpopup); - -exit: - certsvc_instance_free(instance); } static void _gl_eap_cert_list_btn_cb(void *data, Evas_Object *obj, @@ -1194,133 +1157,6 @@ static void __common_eap_connect_popup_init_item_class(void *data) static gboolean __cert_extract_files(const char *cert_alias, eap_connect_data_t *eap_data) { - int ret; - int validity; - int cert_counts = 0; - int cert_index; - gchar *ca_cert_path = NULL; - gchar *user_cert_path = NULL; - gchar *privatekey_path = NULL; - FILE *fp; - CertSvcInstance cert_instance; - CertSvcString cert_alias_str; - CertSvcCertificateList cert_list; - CertSvcCertificate user_certificate; - CertSvcCertificate ca_certificate; - CertSvcCertificate *selected_certificate = NULL; - X509 *x509 = NULL; - EVP_PKEY *privatekey = NULL; - - ret = certsvc_instance_new(&cert_instance); - if (ret != CERTSVC_SUCCESS) { - ERROR_LOG(UG_NAME_NORMAL, "failed to certsvc_instance_new"); - goto error; - } - ret = certsvc_string_new(cert_instance, cert_alias, strlen(cert_alias), &cert_alias_str); - if (ret != CERTSVC_SUCCESS) { - ERROR_LOG(UG_NAME_NORMAL, "failed to certsvc_string_new"); - goto error; - } - ret = certsvc_pkcs12_load_certificate_list(cert_instance, cert_alias_str, &cert_list); - if (ret != CERTSVC_SUCCESS) { - ERROR_LOG(UG_NAME_NORMAL, "failed to certsvc_pkcs12_load_certificate_list"); - goto error; - } - ret = certsvc_certificate_list_get_length(cert_list, &cert_counts); - if (cert_counts < 1) { - ERROR_LOG(UG_NAME_NORMAL, "there is no certificates"); - goto error; - } - INFO_LOG(UG_NAME_NORMAL, "cert counts: %d", cert_counts); - selected_certificate = g_try_new0(CertSvcCertificate, cert_counts); - if (selected_certificate == NULL) { - ERROR_LOG(UG_NAME_NORMAL, "failed to allocate memory"); - goto error; - } - ret = certsvc_certificate_list_get_one(cert_list, 0, &user_certificate); - if (ret != CERTSVC_SUCCESS) { - ERROR_LOG(UG_NAME_NORMAL, "failed to certsvc_certificate_list_get_one"); - goto error; - } - cert_index = cert_counts - 1; - - selected_certificate[0] = user_certificate; - - ret = certsvc_certificate_dup_x509(user_certificate, &x509); - - user_cert_path = g_strdup_printf("%s%s_%s", EAP_TLS_PATH, - cert_alias, EAP_TLS_USER_CERT_PATH); - if ((fp = fopen(user_cert_path, "w")) == NULL) { - goto error; - } - ret = PEM_write_X509(fp, x509); - fclose(fp); - certsvc_certificate_free_x509(x509); - INFO_LOG(UG_NAME_NORMAL, "success to save user_cert file"); - - ca_cert_path = g_strdup_printf("%s%s_%s", EAP_TLS_PATH, cert_alias, - EAP_TLS_CA_CERT_PATH); - while (cert_index) { - ret = certsvc_certificate_list_get_one(cert_list, cert_index, &ca_certificate); - if (ret != CERTSVC_SUCCESS) { - ERROR_LOG(UG_NAME_NORMAL, "failed to certsvc_certificate_list_get_one"); - goto error; - } - - selected_certificate[cert_counts-cert_index] = ca_certificate; - cert_index--; - - ret = certsvc_certificate_dup_x509(ca_certificate, &x509); - if ((fp = fopen(ca_cert_path, "a")) == NULL) { - goto error; - } - ret = PEM_write_X509(fp, x509); - fclose(fp); - certsvc_certificate_free_x509(x509); - } - INFO_LOG(UG_NAME_NORMAL, "success to save ca_cert file"); - ret = certsvc_certificate_verify(selected_certificate[0], selected_certificate, cert_counts, NULL, 0, &validity); - if (ret != CERTSVC_SUCCESS) { - ERROR_LOG(UG_NAME_NORMAL, "failed to verify ca_certificate"); - goto error; - } - if (validity == 0) { - ERROR_LOG(UG_NAME_NORMAL, "Invalid certificate"); - goto error; - } - - ret = certsvc_pkcs12_dup_evp_pkey(cert_instance, cert_alias_str, &privatekey); - - privatekey_path = g_strdup_printf("%s%s_%s", EAP_TLS_PATH, - cert_alias, EAP_TLS_PRIVATEKEY_PATH); - - if ((fp = fopen(privatekey_path, "w")) == NULL) { - goto error; - } - ret = PEM_write_PrivateKey(fp, privatekey, NULL, NULL, 0, NULL, NULL); - fclose(fp); - certsvc_pkcs12_free_evp_pkey(privatekey); - INFO_LOG(UG_NAME_NORMAL, "success to save privatekey file"); - - g_free(selected_certificate); - certsvc_instance_free(cert_instance); - - eap_data->ca_cert_path = ca_cert_path; - eap_data->user_cert_path = user_cert_path; - eap_data->privatekey_path = privatekey_path; - - return TRUE; - -error: - g_free(ca_cert_path); - g_free(user_cert_path); - g_free(privatekey_path); - - if (selected_certificate) { - g_free(selected_certificate); - } - - certsvc_instance_free(cert_instance); return FALSE; } @@ -1606,7 +1442,6 @@ static Evas_Object* _create_list(Evas_Object* parent, void *data) eap_data->eap_done_ok = FALSE; eap_data->genlist = view_list = elm_genlist_add(parent); - elm_genlist_realization_mode_set(view_list, TRUE); elm_genlist_mode_set(view_list, ELM_LIST_COMPRESS); elm_scroller_content_min_limit(view_list, EINA_FALSE, EINA_TRUE); diff --git a/sources/libraries/Common/common_pswd_popup.c b/sources/libraries/Common/common_pswd_popup.c index aeedd3b..0e36fdc 100755 --- a/sources/libraries/Common/common_pswd_popup.c +++ b/sources/libraries/Common/common_pswd_popup.c @@ -759,7 +759,6 @@ pswd_popup_t *create_passwd_popup(Evas_Object *conformant,Evas_Object *win_main, _common_wps_options_popup_cb, pswd_popup_data); } - elm_genlist_realization_mode_set(genlist, EINA_TRUE); evas_object_show(genlist); elm_object_content_set(passpopup, genlist); diff --git a/sources/libraries/Common/common_utils.c b/sources/libraries/Common/common_utils.c index 793ba46..5dc447c 100755 --- a/sources/libraries/Common/common_utils.c +++ b/sources/libraries/Common/common_utils.c @@ -557,8 +557,6 @@ int common_utils_send_message_to_net_popup(const char *title, bundle_add(b, "_SYSPOPUP_TYPE_", type); bundle_add(b, "_AP_NAME_", ssid); - ret = aul_launch_app("net.netpopup", b); - bundle_free(b); return ret; diff --git a/sources/libraries/appcoreWrapper/appcoreWrapper.c b/sources/libraries/appcoreWrapper/appcoreWrapper.c index d33c399..a643b8c 100644 --- a/sources/libraries/appcoreWrapper/appcoreWrapper.c +++ b/sources/libraries/appcoreWrapper/appcoreWrapper.c @@ -17,7 +17,6 @@ * */ -#include #include #include "common.h" @@ -32,7 +31,6 @@ static void __appcore_win_del(void *data, Evas_Object *obj, void *event) Evas_Object* appcore_create_win(const char *name, Elm_Win_Type type) { Evas_Object *eo; - int w, h; eo = elm_win_add(NULL, name, type); if (eo) { @@ -40,9 +38,6 @@ Evas_Object* appcore_create_win(const char *name, Elm_Win_Type type) elm_win_borderless_set(eo, EINA_TRUE); evas_object_smart_callback_add(eo, "delete,request", __appcore_win_del, NULL); - ecore_x_window_size_get(ecore_x_window_root_first_get(), - &w, &h); - evas_object_resize(eo, w, h); } return eo; diff --git a/sources/ui-gadget/include/ug_wifi.h b/sources/ui-gadget/include/ug_wifi.h index 38ede8f..f7e05e4 100644 --- a/sources/ui-gadget/include/ug_wifi.h +++ b/sources/ui-gadget/include/ug_wifi.h @@ -37,8 +37,6 @@ extern "C" #include "winset_popup.h" #include "wlan_manager.h" #include "viewer_manager.h" -#include -#include #include #include @@ -70,8 +68,6 @@ typedef struct { popup_manager_object_t *popup_manager; #endif eap_connect_data_t *eap_view; - Ea_Theme_Color_Table *color_table; - Ea_Theme_Font_Table *font_table; bool is_hidden; guint timeout; diff --git a/sources/ui-gadget/viewers-layout/view_detail.c b/sources/ui-gadget/viewers-layout/view_detail.c index 43829b3..0114f83 100755 --- a/sources/ui-gadget/viewers-layout/view_detail.c +++ b/sources/ui-gadget/viewers-layout/view_detail.c @@ -650,7 +650,6 @@ void view_detail(wifi_device_info_t *device_info, Evas_Object *win_main, detailview_list = elm_genlist_add(layout); assertm_if(NULL == detailview_list, "NULL!!"); - elm_genlist_realization_mode_set(detailview_list, TRUE); elm_object_style_set(detailview_list, "dialogue"); _detail_data->view_detail_list = detailview_list; diff --git a/sources/ui-gadget/viewers-layout/view_ime_hidden.c b/sources/ui-gadget/viewers-layout/view_ime_hidden.c index 8132df2..6013fff 100644 --- a/sources/ui-gadget/viewers-layout/view_ime_hidden.c +++ b/sources/ui-gadget/viewers-layout/view_ime_hidden.c @@ -294,7 +294,6 @@ void view_hidden_ap_popup_create(Evas_Object *win_main, const char *str_pkg_name genlist = elm_genlist_add(passpopup); evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_genlist_realization_mode_set(genlist, EINA_TRUE); elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE); g_entry_itc.item_style = "entry"; diff --git a/sources/ui-gadget/viewers-layout/viewer_manager.c b/sources/ui-gadget/viewers-layout/viewer_manager.c index ef812e2..8d2bd4f 100755 --- a/sources/ui-gadget/viewers-layout/viewer_manager.c +++ b/sources/ui-gadget/viewers-layout/viewer_manager.c @@ -18,7 +18,6 @@ */ #include -#include #include #include #include @@ -2018,12 +2017,6 @@ static void __hidden_ap_cancel_keydown_cb(void *data, Evas *e, Evas_Object *obj, { __COMMON_FUNC_ENTER__; - Evas_Event_Key_Down *event = event_info; - - if (g_strcmp0(event->keyname, KEY_BACK) == 0) { - hidden_ap_connect_cancel_cb(data, obj, event_info); - } - __COMMON_FUNC_EXIT__; } diff --git a/sources/ui-gadget/wifi-efl-UG.c b/sources/ui-gadget/wifi-efl-UG.c index e1f5e2a..c17c451 100755 --- a/sources/ui-gadget/wifi-efl-UG.c +++ b/sources/ui-gadget/wifi-efl-UG.c @@ -207,15 +207,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, app_control_get_extra_data(app_control, "z_order", &zorder); INFO_LOG(UG_NAME_NORMAL, "zorder [%s]", zorder); if (zorder != NULL && 0 == g_strcmp0(zorder, "highest")) { - Ecore_X_Window xwin = elm_win_xwindow_get(ugd->win_main); - unsigned int val[3] = {0, 0, 0}; - ecore_x_netwm_window_type_set(xwin, - ECORE_X_WINDOW_TYPE_NOTIFICATION); - efl_util_set_notification_window_level(ugd->win_main, - UTILX_NOTIFICATION_LEVEL_NORMAL); - Ecore_X_Atom ATOM_PANEL_SCROLLABLE_STATE = - ecore_x_atom_get(STR_ATOM_PANEL_SCROLLABLE_STATE); - ecore_x_window_prop_card32_set(xwin, ATOM_PANEL_SCROLLABLE_STATE, val, 3); g_free(zorder); zorder = NULL; } diff --git a/sources/wifi-syspopup/include/wifi-syspopup.h b/sources/wifi-syspopup/include/wifi-syspopup.h index abe1e88..f6023b4 100644 --- a/sources/wifi-syspopup/include/wifi-syspopup.h +++ b/sources/wifi-syspopup/include/wifi-syspopup.h @@ -73,8 +73,6 @@ typedef struct wifi_object { pswd_popup_t *passpopup; eap_connect_data_t *eap_popup; Evas_Object *alertpopup; - Ea_Theme_Color_Table *color_table; - Ea_Theme_Font_Table *font_table; /* Sort type*/ int sort_type; diff --git a/sources/wifi-syspopup/viewer-popups/view-main.c b/sources/wifi-syspopup/viewer-popups/view-main.c index 4daca46..d0cb318 100755 --- a/sources/wifi-syspopup/viewer-popups/view-main.c +++ b/sources/wifi-syspopup/viewer-popups/view-main.c @@ -17,7 +17,6 @@ * */ -#include #include "common.h" #include "view-main.h" #include "common_pswd_popup.h" diff --git a/sources/wifi-syspopup/wifi-syspopup.c b/sources/wifi-syspopup/wifi-syspopup.c index 1f012f7..2e1590d 100755 --- a/sources/wifi-syspopup/wifi-syspopup.c +++ b/sources/wifi-syspopup/wifi-syspopup.c @@ -22,8 +22,6 @@ #include #include #include -#include -#include #include #include "common.h" @@ -308,9 +306,6 @@ static Eina_Bool __key_press_cb(void *data, int type, void *event) if (!ev) return ECORE_CALLBACK_RENEW; - if (strcmp(ev->keyname, KEY_HOME) == 0) - wifi_devpkr_destroy(); - __COMMON_FUNC_EXIT__; return ECORE_CALLBACK_RENEW; @@ -542,7 +537,6 @@ static void app_control(app_control_h request, void *data) Evas_Object *win_main = NULL; Evas *evas = NULL; - Ecore_X_Window xwin; char *caller = NULL; assertm_if(NULL == data, "data param is NULL!!"); @@ -567,11 +561,6 @@ static void app_control(app_control_h request, void *data) elm_win_alpha_set(devpkr_app_state->win_main, EINA_TRUE); /* invisible window */ - xwin = elm_win_xwindow_get(win_main); - ecore_x_icccm_name_class_set(xwin, "APP_POPUP", "APP_POPUP"); - - utilx_set_system_notification_level(ecore_x_display_get(), elm_win_xwindow_get(win_main), UTILX_NOTIFICATION_LEVEL_LOW); - elm_win_borderless_set(devpkr_app_state->win_main, EINA_TRUE); /* No borders */ elm_win_conformant_set(devpkr_app_state->win_main, TRUE); /* Popup autoscroll */