Added the code for setting view data

Change-Id: Ib227a9f2eb2f83b6d13ef5653e7b90466bae090c
Signed-off-by: Hyojung Jo <hj903.jo@samsung.com>

diff --git a/src/main.c b/src/main.c
index 4f07741c8d364c8c5a4b6ff7f34f6f9948d3116a..a5aaddcedfbda7e68fdbd09b3c7cf12b36360787 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -50,7 +50,7 @@ static bool _create(void *data)
                return false;
        }
 
-       if (!viewmgr_create(ad->win)) {
+       if (!viewmgr_create(win)) {
                _ERR("Create viewmgr failed.");
                evas_object_del(win);
                return false;

diff --git a/src/view/view_action_menu.c b/src/view/view_action_menu.c
index bb8e18765c285dee669fa41fa9fd539434ef0b1d..27dd1d2f2508598e2a05dfe137c10a5b116d82af 100644 (file)
--- a/src/view/view_action_menu.c
+++ b/src/view/view_action_menu.c
@@ -54,6 +54,13 @@ static Evas_Object *_create(Evas_Object *win, void *data)
        priv->win = win;
        priv->base = base;
 
+       if (!viewmgr_set_view_data(VIEW_ACTION_MENU, priv)) {
+               _ERR("Set view data failed.");
+               evas_object_del(base);
+               free(priv);
+               return NULL;
+       }
+
        return base;
 }
 

diff --git a/src/view/view_base.c b/src/view/view_base.c
index cc03d97fd6eacc312219c5769c8217c42d399a58..091f863d8c08405af32e5d86f27bae7ac2e67516 100644 (file)
--- a/src/view/view_base.c
+++ b/src/view/view_base.c
@@ -77,6 +77,12 @@ static Evas_Object *_create(Evas_Object *win, void *data)
        priv->base = base;
        priv->lmgr = lmgr;
 
+       if (!viewmgr_set_view_data(VIEW_BASE, priv)) {
+               _ERR("Set view data failed.");
+               layoutmgr_destroy(lmgr);
+               goto end;
+       }
+
        return base;
 
 end: