summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKim Youngjin <yj21c.kim@samsung.com>2015-04-14 09:14:06 +0900
committerKim Youngjin <yj21c.kim@samsung.com>2015-04-14 09:14:56 +0900
commit35257b47976c3cac732087068e5d6591a7ba3708 (patch)
tree23cdf49d90464de45d8d107126807b3a0f46e816 /src
parent875693453f05d1626b9c6c8fc9ba9e01d8454418 (diff)
downloadsettings-35257b47976c3cac732087068e5d6591a7ba3708.tar.gz
settings-35257b47976c3cac732087068e5d6591a7ba3708.tar.bz2
settings-35257b47976c3cac732087068e5d6591a7ba3708.zip
WifiAp module is added.
Change-Id: I90ade7e2875582b9cf0b54850064568e757dfa62 Signed-off-by: Kim Youngjin <yj21c.kim@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/settingviewmgr.cpp21
-rw-r--r--src/view_sublist.cpp7
2 files changed, 13 insertions, 15 deletions
diff --git a/src/settingviewmgr.cpp b/src/settingviewmgr.cpp
index 674f3bf..eff41e7 100644
--- a/src/settingviewmgr.cpp
+++ b/src/settingviewmgr.cpp
@@ -327,20 +327,19 @@ bool CSettingMgr::Initialize(Evas_Object *win)
ASSERT(!instance);
ASSERT(win);
- struct settingmgr_data *data;
- CTimeoutHandler *handler;
+ //struct settingmgr_data *data;
+ //CTimeoutHandler *handler;
_CREATE_BEGIN{
_CHECK(instance = new CSettingMgr);
_CHECK(instance->m = new SSettingMgr);
- _CHECK(data = viewmgr_data_init());
- _CHECK(handler = new CTimeoutHandler);
- _CHECK(handler->Create(TIMEOUT_SECS));
-
-
- _CHECK_FAIL{ handler->Destroy(); }
- _CHECK_FAIL{ delete handler; }
- _CHECK_FAIL{ viewmgr_data_fini(data); }
+ _CHECK(instance->m->data = viewmgr_data_init());
+ _CHECK(instance->m->handler = new CTimeoutHandler);
+ _CHECK(instance->m->handler->Create(TIMEOUT_SECS));
+
+ _CHECK_FAIL{ instance->m->handler->Destroy(); }
+ _CHECK_FAIL{ delete instance->m->handler; }
+ _CHECK_FAIL{ viewmgr_data_fini(instance->m->data); }
_CHECK_FAIL{ delete instance->m; }
_CHECK_FAIL{ delete instance; instance = NULL; }
} _CREATE_END_AND_CATCH{ return false; }
@@ -362,8 +361,6 @@ bool CSettingMgr::Initialize(Evas_Object *win)
instance->m->win = win;
instance->m->depth = 0;
- instance->m->data = data;
- instance->m->handler = handler;
instance->m->is_freeze = EINA_FALSE;
instance->m->view_list = NULL;
instance->m->item_path = NULL;
diff --git a/src/view_sublist.cpp b/src/view_sublist.cpp
index 1f5b6f2..25dfb3c 100644
--- a/src/view_sublist.cpp
+++ b/src/view_sublist.cpp
@@ -410,9 +410,10 @@ bool CSublistView::m_DrawSublist(void)
{
_DBG();
Eina_List *list;
- double ratio, w;
- int cnt, x, y, height, screen_h;
- struct obj_geometry_data *param;
+ //double ratio, w;
+ int cnt;
+ //int x, y, height, screen_h;
+ //struct obj_geometry_data *param;
if (!m->sublist_view || !m->geometry_data) {
_ERR("Invalid argument\n");