tizen 2.4 release

[framework/security/cert-svc-ui.git] / view / src / certificates / trusted_root_ca_cert / trusted_root_ca_cert.c

diff --git a/view/src/certificates/trusted_root_ca_cert/trusted_root_ca_cert.c b/view/src/certificates/trusted_root_ca_cert/trusted_root_ca_cert.c
index 355f23d..9706348 100644 (file)
--- a/view/src/certificates/trusted_root_ca_cert/trusted_root_ca_cert.c
+++ b/view/src/certificates/trusted_root_ca_cert/trusted_root_ca_cert.c
@@ -20,75 +20,66 @@
  * @brief
  */
 
-#include <dlog.h>
-
+#include "common-utils.h"
 #include "certificates/certificate_util.h"
 #include "certificates/certificates.h"
 
-#include <dirent.h>
-
 static Eina_Bool trusted_root_cert_create_genlist(struct ug_data *ad, Evas_Object *parent)
 {
-       int index;
        if (!ad)
                return EINA_TRUE;
+
        ad->list_to_refresh = elm_genlist_add(parent);
        evas_object_size_hint_weight_set(ad->list_to_refresh, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(ad->list_to_refresh, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
        Eina_Bool no_content_bool = EINA_TRUE;
-       if(!make_list(ad, ad->list_to_refresh, PATH_CERT_TRUSTEDUSER, ad->list_element)){
-               no_content_bool = EINA_FALSE;
-       }
-       ad->list_element = findLastElement(ad->list_element);
-       if(!make_list(ad, ad->list_to_refresh, PATH_CERT_SSL_ETC, ad->list_element)){
+
+       if (!make_list(ad, ad->list_to_refresh, NULL, ad->list_element))
                no_content_bool = EINA_FALSE;
-       }
+
        return no_content_bool;
 }
 
 void trusted_root_cert_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       LOGD("trusted_root_cert_cb()");
+       Eina_Bool no_content_bool;
+       Elm_Object_Item *nf_it;
+       Evas_Object *box = NULL;
+       struct ListElement *firstListElement;
+       struct ug_data *ad = (struct ug_data *)data;
 
-       if (!data)
+       if (ad == NULL)
                return;
-       struct ug_data *ad = (struct ug_data *) data;
-       struct ListElement *firstListElement = NULL;
-       struct ListElement *lastListElement  = NULL;
+
        firstListElement = initList();
 
        if (!firstListElement) {
-               LOGD("Fail to initList for firstListElement");
+               LOGE("Fail to initList for firstListElement");
                return;
        }
 
-       lastListElement  = firstListElement;
        ad->list_element = firstListElement;
 
-       Elm_Object_Item *nf_it;
-       Evas_Object *box = NULL;
-       Evas_Object *genlist = NULL;
        box = elm_box_add(ad->navi_bar);
        evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-       Eina_Bool no_content_bool = trusted_root_cert_create_genlist(ad, box);
+       no_content_bool = trusted_root_cert_create_genlist(ad, box);
        evas_object_show(ad->list_to_refresh);
        elm_box_pack_end(box, ad->list_to_refresh);
        evas_object_show(box);
 
-       if (!no_content_bool) { // There is some content
-               nf_it = elm_naviframe_item_push(ad->navi_bar, "IDS_ST_BODY_TRUSTED_ROOT_CA_CERTIFICATES_ABB", NULL, NULL, box, NULL);
+       if (!no_content_bool) {
+               nf_it = elm_naviframe_item_push(ad->navi_bar, "IDS_ST_BODY_TRUSTED_ROOT_CA_CERTIFICATES_ABB", common_back_btn(ad), NULL, box, NULL);
        } else {
-               // No content
                Evas_Object *no_content = create_no_content_layout(ad);
-               if(!no_content){
+
+               if (!no_content) {
                        LOGD("Cannot create no_content layout (NULL); return");
                        return;
                }
-
-               nf_it = elm_naviframe_item_push(ad->navi_bar, "IDS_ST_BODY_TRUSTED_ROOT_CA_CERTIFICATES_ABB", NULL, NULL, no_content, NULL);
+               nf_it = elm_naviframe_item_push(ad->navi_bar, "IDS_ST_BODY_TRUSTED_ROOT_CA_CERTIFICATES_ABB", common_back_btn(ad), NULL, no_content, NULL);
        }
        elm_object_item_domain_text_translatable_set(nf_it, PACKAGE, EINA_TRUE);
        elm_naviframe_item_pop_cb_set(nf_it, back_cb, (struct Evas_Object *)ad);