Replace deprecated dpm handles with device_policy_manager_h

[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 93caa7a..43a21f2 100755 (executable)
--- a/src/mh_view_wifi_setup.c
+++ b/src/mh_view_wifi_setup.c
@@ -134,9 +134,8 @@ static char *__gl_device_name_title_label_get(void *data, Evas_Object *obj, cons
 
        if (!strcmp("elm.text.multiline", part)) {
                device_name_utf = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
-               if (device_name_utf == NULL) {
+               if (device_name_utf == NULL)
                        ERR("vconf_get_str failed \n");
-               }
 
                ptr = elm_entry_utf8_to_markup(device_name_utf);
                if (ptr == NULL) {
@@ -169,9 +168,8 @@ static char *__gl_hide_label_get(void *data, Evas_Object *obj, const char *part)
                return NULL;
        }
 
-       if (!strcmp("elm.text", part)) {
+       if (!strcmp("elm.text", part))
                return strdup(STR_HIDE_MY_DEV);
-       }
 
        __MOBILE_AP_FUNC_EXIT__;
        return NULL;
@@ -186,9 +184,8 @@ static char *__gl_security_label_get(void *data, Evas_Object *obj, const char *p
                return NULL;
        }
 
-       if (!strcmp("elm.text", part)) {
+       if (!strcmp("elm.text", part))
                return strdup(STR_SECURITY_TYPE);
-       }
 
        __MOBILE_AP_FUNC_EXIT__;
        return NULL;
@@ -349,9 +346,8 @@ static void __pw_entry_maxlength_reached_cb(void *data, Evas_Object *obj,
                        WIFI_PASSPHRASE_LENGTH_MIN, WIFI_PASSPHRASE_LENGTH_MAX);
 
        ret = notification_status_message_post(buf);
-       if (ret != NOTIFICATION_ERROR_NONE) {
+       if (ret != NOTIFICATION_ERROR_NONE)
                ERR("notification_status_message_post() is failed : %d\n", ret);
-       }
 
        __MOBILE_AP_FUNC_EXIT__;
 }
@@ -373,7 +369,7 @@ static void __pw_entry_activated_cb(void *data, Evas_Object *obj, void *event_in
 static void __pw_entry_focused_cb(void *data, Evas_Object *obj, void *event_info)
 {
        __MOBILE_AP_FUNC_ENTER__;
-       evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, __pw_entry_focused_cb);
+       evas_object_smart_callback_del(obj, "focused", __pw_entry_focused_cb);
 
         elm_object_focus_set(obj, EINA_TRUE);
         elm_entry_cursor_end_set(obj);
@@ -531,25 +527,6 @@ static Evas_Object *__get_pw_entry(void *data, Evas_Object *parent)
        return st->pw_entry;
 }
 
-static char *__gl_pw_text_get(void *data, Evas_Object *obj, const char *part)
-{
-       __MOBILE_AP_FUNC_ENTER__;
-       char buf[MH_LABEL_LENGTH_MAX] = {0, };
-
-       if (data == NULL || obj == NULL || part == NULL) {
-               ERR("Invalid param\n");
-               return NULL;
-       }
-
-       if (!strcmp("elm.text.main", part)) {
-               snprintf(buf, MH_LABEL_LENGTH_MAX, "<font_size=30>%s</font_size>", STR_PASSWORD);
-               return strdup(buf);
-       }
-
-       __MOBILE_AP_FUNC_EXIT__;
-       return NULL;
-}
-
 static Evas_Object *__gl_pw_content_get(void *data, Evas_Object *obj, const char *part)
 {
        __MOBILE_AP_FUNC_ENTER__;
@@ -568,14 +545,14 @@ static Evas_Object *__gl_pw_content_get(void *data, Evas_Object *obj, const char
                Evas_Object *layout = elm_layout_add(box);
                char buf[MH_LABEL_LENGTH_MAX] = {0, };
 
-               elm_box_align_set(box, 0.5, 0.5);
+               elm_box_align_set(box, 0.0, 0.0);
 
                /* Set label for name field */
                snprintf(buf, MH_LABEL_LENGTH_MAX, "<text align=left><font_size=30>%s</font_size></text>", STR_PASSWORD);
                elm_object_text_set(label, buf);
                evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
                evas_object_size_hint_weight_set(label, 0.9, EVAS_HINT_EXPAND);
-               evas_object_size_hint_padding_set(label, ELM_SCALE_SIZE(10), ELM_SCALE_SIZE(10), ELM_SCALE_SIZE(10), ELM_SCALE_SIZE(10));
+               evas_object_size_hint_padding_set(label, ELM_SCALE_SIZE(10), ELM_SCALE_SIZE(10), 0, 0);
                elm_box_pack_end(box, label);
                evas_object_show(label);
 
@@ -591,7 +568,7 @@ static Evas_Object *__gl_pw_content_get(void *data, Evas_Object *obj, const char
                evas_object_size_hint_min_set(box, ELM_SCALE_SIZE(w), ELM_SCALE_SIZE(h));
                evas_object_show(box);
 
-       return box;
+               return box;
        }
 
        __MOBILE_AP_FUNC_EXIT__;
@@ -641,19 +618,6 @@ static void __set_genlist_itc(mh_appdata_t *ad)
 {
        __MOBILE_AP_FUNC_ENTER__;
 
-#if 0 /* not used */
-       ad->setup.sp_itc = elm_genlist_item_class_new();
-       if (ad->setup.sp_itc == NULL) {
-               ERR("elm_genlist_item_class_new failed\n");
-               __MOBILE_AP_FUNC_EXIT__;
-               return;
-       }
-       ad->setup.sp_itc->item_style = "dialogue/separator";
-       ad->setup.sp_itc->func.text_get = NULL;
-       ad->setup.sp_itc->func.content_get = NULL;
-       ad->setup.sp_itc->func.state_get = NULL;
-       ad->setup.sp_itc->func.del = NULL;
-#endif
        ad->setup.name_itc = elm_genlist_item_class_new();
        if (ad->setup.name_itc == NULL) {
                ERR("elm_genlist_item_class_new failed\n");
@@ -702,19 +666,6 @@ static void __set_genlist_itc(mh_appdata_t *ad)
        ad->setup.pw_itc->func.state_get = NULL;
        ad->setup.pw_itc->func.del = NULL;
 
-#if 0 /* not used */
-       ad->setup.sp2_itc = elm_genlist_item_class_new();
-       if (ad->setup.sp2_itc == NULL) {
-               ERR("elm_genlist_item_class_new failed\n");
-               __MOBILE_AP_FUNC_EXIT__;
-               return;
-       }
-       ad->setup.sp2_itc->item_style = "dialogue/separator.2";
-       ad->setup.sp2_itc->func.text_get = NULL;
-       ad->setup.sp2_itc->func.content_get = NULL;
-       ad->setup.sp2_itc->func.state_get = NULL;
-       ad->setup.sp2_itc->func.del = NULL;
-#endif
        __MOBILE_AP_FUNC_EXIT__;
        return;
 }
@@ -804,7 +755,7 @@ static void __save_btn_cb(void *data, Evas_Object *object, void *event_info)
                if (ret == false) {
                        g_strlcpy(st->wifi_passphrase_new, st->wifi_passphrase,
                                        sizeof(st->wifi_passphrase_new));
-                       if(st->pw_item)
+                       if (st->pw_item)
                                elm_genlist_item_update(st->pw_item);
                } else {
                        g_strlcpy(st->wifi_passphrase, st->wifi_passphrase_new,
@@ -864,13 +815,11 @@ Eina_Bool _setting_back_btn_cb(void *data, Elm_Object_Item *navi_item)
        mh_appdata_t *ad = (mh_appdata_t *)data;
        mh_wifi_setting_view_t *st = &ad->setup;
 
-       if (st->visibility != st->visibility_new) {
+       if (st->visibility != st->visibility_new)
                st->visibility_new = st->visibility;
-       }
 
-       if (st->security_type != st->security_type_new) {
+       if (st->security_type != st->security_type_new)
                st->security_type_new = st->security_type;
-       }
 
        if (strcmp(st->wifi_passphrase_new, st->wifi_passphrase)) {
                g_strlcpy(st->wifi_passphrase_new, st->wifi_passphrase,
@@ -902,14 +851,12 @@ static void __gl_realized(void *data, Evas_Object *obj, void *event_info)
        int no_of_sp;
        int i;
 
-       if (item == st->hide_item) {
+       if (item == st->hide_item)
                elm_object_item_signal_emit(item, "elm,state,top", "");
-       } else if (item == st->security_item) {
+       else if (item == st->security_item)
                elm_object_item_signal_emit(item, "elm,state,center", "");
-       } else if (item == st->pw_item) {
+       else if (item == st->pw_item)
                elm_object_item_signal_emit(item, "elm,state,bottom", "");
-       } else if (item == st->name_item) {
-       }
 
        no_of_sp = sizeof(st->sp_item) / sizeof(st->sp_item[0]);
        for (i = 0; i < no_of_sp; i++) {
@@ -946,8 +893,6 @@ static void __select_passphrase_item(void *data, Evas_Object *obj, void *event_i
                return;
        }
 
-       Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-       Evas_Object *layout = NULL;
        mh_appdata_t *ad = (mh_appdata_t *)data;
        mh_wifi_setting_view_t *st = &ad->setup;
 
@@ -979,7 +924,6 @@ 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);
 
        __set_genlist_itc(ad);