Two Indicator Issue

[Issue#] There are two indicator
[Problem]
[Cause] There must be one conformant in one window, based on new window structure policy.
[Solution] One of Two conformant elementry has been deleted.
[SCMRequest] N/A

Change-Id: I9df41db5fdf1e64244fb300983d6141988b353d8

diff --git a/webapp-common/listview.cpp b/webapp-common/listview.cpp
index 946c20c..fd7751d 100755 (executable)
--- a/webapp-common/listview.cpp
+++ b/webapp-common/listview.cpp
@@ -952,36 +952,27 @@ void ListView::addComplianceModeOpts(Evas_Object *obj, Elm_Object_Item *it)
 
 bool ListView::loadView(void)
 {
-    Evas_Object *gl;
     Evas_Object *win;
-    Evas_Object *conform;
 
     Assert(m_naviFrame);
     resetBase();
     win = static_cast<Evas_Object *>(ug_get_window());
     Assert(win);
-    elm_win_conformant_set(win, EINA_TRUE);
-    conform = elm_conformant_add(m_naviFrame);
-    if (!conform)
-        return false;
-    elm_object_style_set(conform, "layout");
 
-    gl = elm_genlist_add(conform);
-    if (!gl) {
-        evas_object_del(conform);
+    m_gl = elm_genlist_add(m_naviFrame);
+    if (!m_gl) {
+        evas_object_del(m_naviFrame);
         return false;
     }
     bindtextdomain("ug-webapp-common-efl",
         MOFILE_INSTALL_DIR);
-    elm_object_style_set(gl, "dialogue");
-    elm_object_content_set(conform, gl);
-    resetBase(conform);
-    addDepth(gl);
-    addOnOffItem(gl,
+    elm_object_style_set(m_gl, "dialogue");
+    addDepth(m_gl);
+    addOnOffItem(m_gl,
                 dgettext("ug-webapp-common-efl", COOKIE_SHARING),
                 getCookieSharingVal,
                 onCookieSharingChanged);
-    addDesc(gl,
+    addDesc(m_gl,
             dgettext("ug-webapp-common-efl",
                 SHARE_COOKIES_BETWEEN_WEB_APPS));
     pushToNaviFrame();
@@ -1004,7 +995,7 @@ bool ListView::pushToNaviFrame(void)
                             "Web applications",
                             btn,
                             NULL,
-                            getBase(),
+                            m_gl,
                             NULL);
 
     return true;

diff --git a/webapp-common/listview.h b/webapp-common/listview.h
index 430bbd1..45c7712 100755 (executable)
--- a/webapp-common/listview.h
+++ b/webapp-common/listview.h
@@ -34,6 +34,7 @@ typedef bool (*GetOnOffVal)(void);
 class ListView : public View
 {
     Evas_Object *m_naviFrame;
+    Evas_Object *m_gl;
     Popup m_popup;
     DPL::ScopedPtr<WhiteListView> m_whiteListView;