Remove unused type (TETHERING_TYPE_RESERVED)

[apps/native/ug-mobile-ap.git] / src / mh_view_wifi_setup.c

diff --git a/src/mh_view_wifi_setup.c b/src/mh_view_wifi_setup.c
index 19223f0..a6295f0 100755 (executable)
--- a/src/mh_view_wifi_setup.c
+++ b/src/mh_view_wifi_setup.c
@@ -201,7 +201,6 @@ static Evas_Object *__gl_hide_icon_get(void *data, Evas_Object *obj,
 
        mh_appdata_t *ad = (mh_appdata_t *)data;
        Evas_Object *btn = NULL;
-       Evas_Object *icon_layout = NULL;
 
        if (data == NULL || obj == NULL || part == NULL) {
                ERR("Invalid param\n");
@@ -209,8 +208,6 @@ static Evas_Object *__gl_hide_icon_get(void *data, Evas_Object *obj,
        }
 
        if (!strcmp("elm.swallow.end", part)) {
-               icon_layout = elm_layout_add(obj);
-               elm_layout_theme_set(icon_layout, "layout", "list/C/type.3", "default");
                btn = elm_check_add(obj);
                if (btn == NULL) {
                        ERR("btn is NULL\n");
@@ -226,12 +223,10 @@ static Evas_Object *__gl_hide_icon_get(void *data, Evas_Object *obj,
                evas_object_smart_callback_add(btn, "changed",
                                __hide_btn_changed_cb, (void *)ad);
                ad->setup.hide_btn = btn;
-
-               elm_layout_content_set(icon_layout, "elm.swallow.content", btn);
        }
 
        __MOBILE_AP_FUNC_EXIT__;
-       return icon_layout;
+       return btn;
 }
 
 static Evas_Object *__gl_security_icon_get(void *data, Evas_Object *obj,
@@ -241,7 +236,6 @@ static Evas_Object *__gl_security_icon_get(void *data, Evas_Object *obj,
 
        mh_appdata_t *ad = (mh_appdata_t *)data;
        Evas_Object *btn = NULL;
-       Evas_Object *icon_layout = NULL;
 
        if (data == NULL || obj == NULL || part == NULL) {
                ERR("Invalid param\n");
@@ -249,9 +243,6 @@ static Evas_Object *__gl_security_icon_get(void *data, Evas_Object *obj,
        }
 
        if (!strcmp("elm.swallow.end", part)) {
-               icon_layout = elm_layout_add(obj);
-               elm_layout_theme_set(icon_layout, "layout", "list/C/type.3", "default");
-
                btn = elm_check_add(obj);
                elm_object_style_set(btn, "on&off");
                evas_object_show(btn);
@@ -263,12 +254,10 @@ static Evas_Object *__gl_security_icon_get(void *data, Evas_Object *obj,
                evas_object_smart_callback_add(btn, "changed",
                                __security_btn_changed_cb, (void *)ad);
                ad->setup.security_btn = btn;
-
-               elm_layout_content_set(icon_layout, "elm.swallow.content", btn);
        }
 
        __MOBILE_AP_FUNC_EXIT__;
-       return icon_layout;
+       return btn;
 }
 
 static bool __save_wifi_passphrase(mh_appdata_t *ad)
@@ -353,9 +342,10 @@ static void __pw_entry_maxlength_reached_cb(void *data, Evas_Object *obj,
                return;
        }
        char buf[MH_LABEL_LENGTH_MAX] = { 0, };
+       char *fmt = STR_PASSWORD_MIN_MAX;
        notification_error_e ret;
 
-       snprintf(buf, sizeof(buf), STR_PASSWORD_MIN_MAX,
+       snprintf(buf, sizeof(buf), fmt,
                        WIFI_PASSPHRASE_LENGTH_MIN, WIFI_PASSPHRASE_LENGTH_MAX);
 
        ret = notification_status_message_post(buf);
@@ -419,8 +409,9 @@ static void __pw_entry_language_changed_cb(void *data, Evas_Object *obj, void *e
        mh_appdata_t *ad = (mh_appdata_t *)data;
        mh_wifi_setting_view_t *st = &ad->setup;
        char buf[MH_LABEL_LENGTH_MAX];
+       char *fmt = STR_PW_GUIDE_TEXT;
 
-       snprintf(buf, sizeof(buf), STR_PW_GUIDE_TEXT, WIFI_PASSPHRASE_LENGTH_MIN);
+       snprintf(buf, sizeof(buf), fmt, WIFI_PASSPHRASE_LENGTH_MIN);
 
        if (st->security_type_new == TETHERING_WIFI_SECURITY_TYPE_NONE) {
                if (st->pw_item)
@@ -437,6 +428,7 @@ static Evas_Object *__get_pw_entry(void *data, Evas_Object *parent)
 
        static Elm_Entry_Filter_Limit_Size limit_filter_data;
        Evas_Object *entry = NULL;
+       char *fmt = STR_PW_GUIDE_TEXT;
        char *ptr = NULL;
        Evas_Object * clr_btn = NULL;
        char buf[MH_LABEL_LENGTH_MAX];
@@ -470,7 +462,7 @@ static Evas_Object *__get_pw_entry(void *data, Evas_Object *parent)
        elm_object_signal_emit(entry, "elm,action,hide,search_icon", "");
        elm_entry_input_panel_layout_set(entry, ELM_INPUT_PANEL_LAYOUT_PASSWORD);
        elm_entry_cursor_end_set(entry);
-       snprintf(buf, sizeof(buf), STR_PW_GUIDE_TEXT, WIFI_PASSPHRASE_LENGTH_MIN);
+       snprintf(buf, sizeof(buf), fmt, WIFI_PASSPHRASE_LENGTH_MIN);
        elm_object_part_text_set(entry, "elm.guide", buf);
        elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
 
@@ -545,9 +537,7 @@ static Evas_Object *__gl_pw_content_get(void *data, Evas_Object *obj, const char
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-       mh_appdata_t *ad = (mh_appdata_t *)data;
        Evas_Object * layout = NULL;
-       Evas_Object * entry = NULL;
 
        if (data == NULL) {
                ERR("data is null \n");
@@ -559,8 +549,6 @@ static Evas_Object *__gl_pw_content_get(void *data, Evas_Object *obj, const char
                elm_layout_theme_set(layout, "layout", "editfield", "singleline");
                evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, 0.0);
                evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, 0.0);
-
-               entry = __get_pw_entry(ad, layout);
        }
 
        __MOBILE_AP_FUNC_EXIT__;
@@ -951,7 +939,7 @@ Evas_Object *__create_genlist(mh_appdata_t *ad)
        elm_object_style_set(genlist, "dialogue");
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        evas_object_smart_callback_add(genlist, "realized", __gl_realized, ad);
-       elm_genlist_realization_mode_set(genlist, EINA_TRUE);
+       //elm_genlist_realization_mode_set(genlist, EINA_TRUE);
 
        __set_genlist_itc(ad);