disconnect event handler when destroy

Change-Id: I6037c8559a8aa61566014fbe6aabd923fcc2928d
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

diff --git a/src/view/ctxtmenu-view/ctxtmenu_view.cpp b/src/view/ctxtmenu-view/ctxtmenu_view.cpp
index d27e386..338c180 100644 (file)
--- a/src/view/ctxtmenu-view/ctxtmenu_view.cpp
+++ b/src/view/ctxtmenu-view/ctxtmenu_view.cpp
@@ -836,9 +836,16 @@ void CCtxtMenuView::Destroy(void)
 {
        ASSERT(m);
 
-       evas_object_del(Base());
+       int i;
+
+       for (i = 0; i < MAX_FUNC_BTN; i++)
+               Disconnect(m->func_btn[i]);
 
+       Disconnect(m->grid);
        Disconnect(Base());
+
+       evas_object_del(Base());
+
        CBaseView::Destroy();
 
        m->cTimeout.Destroy();

diff --git a/src/view/gallery-view/gallery_view.cpp b/src/view/gallery-view/gallery_view.cpp
index 9746b02..c58b2eb 100644 (file)
--- a/src/view/gallery-view/gallery_view.cpp
+++ b/src/view/gallery-view/gallery_view.cpp
@@ -594,6 +594,18 @@ void CGalleryView::Destroy(void)
 {
        ASSERT(m);
 
+       int i;
+
+       for (i = 0; i < MENUITEM_SIZE; i++)
+               Disconnect(m->btn[i]);
+
+       Disconnect(m->sortbtn);
+       Disconnect(m->sourcebtn);
+
+       evas_object_del(Base());
+
+       CBaseView::Destroy();
+
        CMediaContentListener::Destroy();
        if (CUsbListener::FlagCreate())
                CUsbListener::Destroy();
@@ -612,10 +624,6 @@ void CGalleryView::Destroy(void)
        m->pFolderLayout->Destroy();
        delete m->pFolderLayout;
 
-       evas_object_del(Base());
-
-       Disconnect(Base());
-       CBaseView::Destroy();
        m->pLayoutMgr->Destroy();
        delete m->pLayoutMgr;
 

diff --git a/src/view/gallery-view/layout_all.cpp b/src/view/gallery-view/layout_all.cpp
index bcfe028..aac19e0 100644 (file)
--- a/src/view/gallery-view/layout_all.cpp
+++ b/src/view/gallery-view/layout_all.cpp
@@ -608,6 +608,8 @@ void CAllLayout::Destroy(void)
 {
        ASSERT(m);
 
+       Disconnect(m->grid);
+
        if (m->media_list)
                eina_list_free(m->media_list);
 

diff --git a/src/view/gallery-view/layout_events.cpp b/src/view/gallery-view/layout_events.cpp
index fc851a1..2a5a34e 100644 (file)
--- a/src/view/gallery-view/layout_events.cpp
+++ b/src/view/gallery-view/layout_events.cpp
@@ -689,6 +689,8 @@ void CEventLayout::Destroy(void)
 {
        ASSERT(m);
 
+       Disconnect(m->grid);
+
        if (m->media_list)
                eina_list_free(m->media_list);
 

diff --git a/src/view/gallery-view/layout_folder.cpp b/src/view/gallery-view/layout_folder.cpp
index e41b1d8..785b444 100644 (file)
--- a/src/view/gallery-view/layout_folder.cpp
+++ b/src/view/gallery-view/layout_folder.cpp
@@ -505,6 +505,8 @@ void CFolderLayout::Destroy(void)
 {
        ASSERT(m);
 
+       Disconnect(m->grid);
+
        if (m->media_list)
                eina_list_free(m->media_list);
 

diff --git a/src/view/photo-viewer/photoviewer_view.cpp b/src/view/photo-viewer/photoviewer_view.cpp
index a6eaab4..98b7944 100644 (file)
--- a/src/view/photo-viewer/photoviewer_view.cpp
+++ b/src/view/photo-viewer/photoviewer_view.cpp
@@ -990,9 +990,13 @@ void CPhotoViewerView::Destroy()
 {
        ASSERT(m);
 
+       int i;
+
+       for (i = 0; i < MAX_PHOTO_ICONS; i++)
+               Disconnect(m->btn[i]);
+
        evas_object_del(Base());
 
-       Disconnect(Base());
        CBaseView::Destroy();
 
        m->cTimeoutHandler.Destroy();

diff --git a/src/view/photo-viewer/zoom_view.cpp b/src/view/photo-viewer/zoom_view.cpp
index 5519e4b..b121b00 100644 (file)
--- a/src/view/photo-viewer/zoom_view.cpp
+++ b/src/view/photo-viewer/zoom_view.cpp
@@ -581,9 +581,19 @@ void CPhotoZoomView::Destroy(void)
 {
        ASSERT(m);
 
+       Disconnect(m->eoSlider);
+       Disconnect(m->arrow.eoUp);
+       Disconnect(m->arrow.eoDown);
+       Disconnect(m->arrow.eoLeft);
+       Disconnect(m->arrow.eoRight);
+       Disconnect(m->eoBtn);
+       Disconnect(m->eoPhotocam);
+       Disconnect(m->eoPhotocamNavi);
+       Disconnect(m->eoRect);
+       Disconnect(Base());
+
        evas_object_del(Base());
 
-       Disconnect(Base());
        CBaseView::Destroy();
 
        m->cTimeout.Destroy();