Revert: "view: Fix event remove error"

This reverts commit 179d8f632c341dff92b32d22b2669223ee16c1f1

Change-Id: Ic27bc73b94e0c31ad35ae4a5b62c6ce0ec7081e0

diff --git a/src/bin/core/e_view_edje.c b/src/bin/core/e_view_edje.c
index 4ce40430852da66775c740058841d25670efac5d..729ae15cee139d7eec5e4543cb2f8b6fffe5d6df 100644 (file)
--- a/src/bin/core/e_view_edje.c
+++ b/src/bin/core/e_view_edje.c
@@ -50,8 +50,6 @@ _view_edje_handle_destroy(E_View *view)
    E_View_Edje_Signal *signal, *signal_tmp;
    E_View_Edje_Swallow *swallow, *swallow_tmp;
 
-   e_view_event_listener_del(view, E_VIEW_RESTACK, &edje->restack);
-
    evas_object_del(view->eo);
 
    if (!wl_list_empty(&edje->signals))

diff --git a/src/bin/displaymgr/e_hwc_window.c b/src/bin/displaymgr/e_hwc_window.c
index 742aef0113319963a7209f1f54dec78ff6a3e234..cc8364ae6ba408df45ac294854f6792cea0ec823 100644 (file)
--- a/src/bin/displaymgr/e_hwc_window.c
+++ b/src/bin/displaymgr/e_hwc_window.c
@@ -706,8 +706,6 @@ static void
 _e_hwc_window_del(E_Hwc_Window *hwc_window)
 {
    E_Client *ec;
-   E_View *view;
-   E_View_Client *view_client;
 
    EINA_SAFETY_ON_NULL_RETURN(hwc_window);
 
@@ -716,14 +714,11 @@ _e_hwc_window_del(E_Hwc_Window *hwc_window)
    ec = hwc_window->ec;
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   view_client = e_client_view_get(ec);
-   view = e_view_client_view_get(view_client);
-
-   e_view_event_listener_del(view, E_VIEW_SHOW, &hwc_window->show_listener);
-   e_view_event_listener_del(view, E_VIEW_HIDE, &hwc_window->hide_listener);
-   e_view_event_listener_del(view, E_VIEW_MOVE, &hwc_window->move_listener);
-   e_view_event_listener_del(view, E_VIEW_RESIZE, &hwc_window->resize_listener);
-   e_view_event_listener_del(view, E_VIEW_RESTACK, &hwc_window->restack_listener);
+   wl_list_remove(&hwc_window->show_listener.link);
+   wl_list_remove(&hwc_window->hide_listener.link);
+   wl_list_remove(&hwc_window->move_listener.link);
+   wl_list_remove(&hwc_window->resize_listener.link);
+   wl_list_remove(&hwc_window->restack_listener.link);
 
    ec->hwc_window = NULL;
    hwc_window->ec = NULL;
@@ -3494,7 +3489,6 @@ e_hwc_window_below_transparent_obj_set(E_Hwc_Window *hwc_window, Eina_Bool set)
    E_View_Rect *below_transparent_view;
    const int color[4] = {0, 0, 0, 0};
    E_View *view, *ec_view;
-   E_View_Client *view_client;
 
    EINA_SAFETY_ON_NULL_RETURN(hwc_window);
 
@@ -3547,14 +3541,11 @@ e_hwc_window_below_transparent_obj_set(E_Hwc_Window *hwc_window, Eina_Bool set)
 
         if (hwc_window->ec)
           {
-             view_client = e_client_view_get(hwc_window->ec);
-             view = e_view_client_view_get(view_client);
-
-             e_view_event_listener_del(view, E_VIEW_SHOW, &hwc_window->transparent_show_listener);
-             e_view_event_listener_del(view, E_VIEW_HIDE, &hwc_window->transparent_hide_listener);
-             e_view_event_listener_del(view, E_VIEW_MOVE, &hwc_window->transparent_move_listener);
-             e_view_event_listener_del(view, E_VIEW_RESIZE, &hwc_window->transparent_resize_listener);
-             e_view_event_listener_del(view, E_VIEW_RESTACK, &hwc_window->transparent_restack_listener);
+             wl_list_remove(&hwc_window->transparent_show_listener.link);
+             wl_list_remove(&hwc_window->transparent_hide_listener.link);
+             wl_list_remove(&hwc_window->transparent_move_listener.link);
+             wl_list_remove(&hwc_window->transparent_resize_listener.link);
+             wl_list_remove(&hwc_window->transparent_restack_listener.link);
           }
 
         EHWINF("Unset below_transparent_obj", hwc_window->ec, hwc_window->hwc, hwc_window);

diff --git a/src/bin/server/e_comp_wl_subsurface.c b/src/bin/server/e_comp_wl_subsurface.c
index 435f0f59a07b582f73a7cd4ca51a5dce970590f7..8ec6b79cf49a91135fc85b78667c86ed59b9e1dc 100644 (file)
--- a/src/bin/server/e_comp_wl_subsurface.c
+++ b/src/bin/server/e_comp_wl_subsurface.c
@@ -454,18 +454,11 @@ static void
 _view_client_restack_cb_destroy(struct wl_listener *listener, void *data)
 {
    View_Client_Restack_Data *restack_data;
-   E_View *view;
 
    restack_data = wl_container_of(listener, restack_data, destroy);
 
    wl_list_remove(&restack_data->destroy.link);
-
-   if (!e_object_is_del(E_OBJECT(restack_data->ec)))
-     {
-        view = e_view_client_view_get(e_client_view_get(restack_data->ec));
-        e_view_event_listener_del(view, E_VIEW_RESTACK, &restack_data->view_restack);
-     }
-
+   wl_list_remove(&restack_data->view_restack.link);
    free(restack_data);
 }
 

diff --git a/src/bin/windowmgr/e_magnifier.c b/src/bin/windowmgr/e_magnifier.c
index 232b51225111d2ed40f4e5d889129bc67e6c2e52..f50715b135b05b7a4444f96e26a35037ee3bedd4 100644 (file)
--- a/src/bin/windowmgr/e_magnifier.c
+++ b/src/bin/windowmgr/e_magnifier.c
@@ -936,20 +936,14 @@ _e_magnifier_owner_set(E_Client *ec)
 static void
 _e_magnifier_owner_unset(E_Client *ec)
 {
-   E_View *view;
-   E_View_Client *view_client;
-
    if (!ec) return;
 
    ec->is_magnifier = EINA_FALSE;
 
    if (_e_magnifier_listener)
      {
-        view_client = e_client_view_get(ec);
-        view = e_view_client_view_get(view_client);
-
-        e_view_event_listener_del(view, E_VIEW_MOVE, &_e_magnifier_listener->move_listener);
-        e_view_event_listener_del(view, E_VIEW_RESIZE, &_e_magnifier_listener->resize_listener);
+        wl_list_remove(&_e_magnifier_listener->move_listener.link);
+        wl_list_remove(&_e_magnifier_listener->resize_listener.link);
         E_FREE(_e_magnifier_listener);
         _e_magnifier_listener = NULL;
      }

diff --git a/src/bin/windowmgr/services/e_service_quickpanel.c b/src/bin/windowmgr/services/e_service_quickpanel.c
index 727764d2fc845f0b997cad67eb47dd534d219ba9..3098bc6e19a585b3db8edd4ca040ef30ab3879cc 100644 (file)
--- a/src/bin/windowmgr/services/e_service_quickpanel.c
+++ b/src/bin/windowmgr/services/e_service_quickpanel.c
@@ -1336,20 +1336,11 @@ _region_obj_cb_gesture_end(void *data EINA_UNUSED, Evas_Object *handler, int nfi
 static void
 _quickpanel_free(E_Policy_Quickpanel *qp)
 {
-   E_View *view;
-   E_View_Client *view_client;
-
    ELOGF("QUICKPANEL", "Remove Client | qp %p", qp->ec, qp);
 
-   if (qp->ec)
-     {
-        view_client = e_client_view_get(qp->ec);
-        view = e_view_client_view_get(view_client);
-
-        e_view_event_listener_del(view, E_VIEW_SHOW, &qp->show_listener);
-        e_view_event_listener_del(view, E_VIEW_HIDE, &qp->hide_listener);
-        e_view_event_listener_del(view, E_VIEW_MOVE, &qp->move_listener);
-     }
+   wl_list_remove(&qp->show_listener.link);
+   wl_list_remove(&qp->hide_listener.link);
+   wl_list_remove(&qp->move_listener.link);
 
    if (qp->bg_rect)
      evas_object_del(qp->bg_rect);

diff --git a/src/bin/windowmgr/services/e_service_softkey.c b/src/bin/windowmgr/services/e_service_softkey.c
index f2329decc575486e3ff725aee550bc1e375fe941..795bb4bca9092a47dc8fa87a2c566b1bb3444e5d 100644 (file)
--- a/src/bin/windowmgr/services/e_service_softkey.c
+++ b/src/bin/windowmgr/services/e_service_softkey.c
@@ -379,9 +379,6 @@ e_service_softkey_client_set(E_Client *ec)
 EINTERN void
 e_service_softkey_client_unset(E_Client *ec)
 {
-   E_View *view;
-   E_View_Client *view_client;
-
    ELOGF("SOFTKEY_SRV", "%s", ec, __func__);
 
    E_Service_Softkey *softkey_service;
@@ -398,12 +395,8 @@ e_service_softkey_client_unset(E_Client *ec)
    if (!softkey_service) return;
 
    E_FREE_LIST(softkey_service->events, ecore_event_handler_del);
-
-   view_client = e_client_view_get(ec);
-   view = e_view_client_view_get(view_client);
-
-   e_view_event_listener_del(view, E_VIEW_SHOW, &softkey_service->show_listener);
-   e_view_event_listener_del(view, E_VIEW_HIDE, &softkey_service->hide_listener);
+   wl_list_remove(&softkey_service->show_listener.link);
+   wl_list_remove(&softkey_service->hide_listener.link);
 
    e_service_softkey_del(softkey_service);
 }

diff --git a/src/bin/windowmgr/services/e_service_volume.c b/src/bin/windowmgr/services/e_service_volume.c
index 2817f257c5ea033958a9359910892aea04a46659..bdf97c6c02291e2b33e98c382f140e5daee8aa1c 100644 (file)
--- a/src/bin/windowmgr/services/e_service_volume.c
+++ b/src/bin/windowmgr/services/e_service_volume.c
@@ -190,8 +190,6 @@ static void
 _region_objs_del(E_Policy_Angle_Map angle_map)
 {
    Evas_Object *obj;
-   E_View *view;
-   E_View_Client *view_client;
 
    EINA_LIST_FREE(_volume_region_objs[angle_map], obj)
       _region_obj_del(obj);
@@ -203,13 +201,10 @@ _region_objs_del(E_Policy_Angle_Map angle_map)
 
         if (_volume_listener)
           {
-             view_client = e_client_view_get(_volume_ec);
-             view = e_view_client_view_get(view_client);
-
-             e_view_event_listener_del(view, E_VIEW_SHOW, &_volume_listener->show_listener);
-             e_view_event_listener_del(view, E_VIEW_HIDE, &_volume_listener->hide_listener);
-             e_view_event_listener_del(view, E_VIEW_MOVE, &_volume_listener->move_listener);
-             e_view_event_listener_del(view, E_VIEW_RESTACK, &_volume_listener->restack_listener);
+             wl_list_remove(&_volume_listener->show_listener.link);
+             wl_list_remove(&_volume_listener->hide_listener.link);
+             wl_list_remove(&_volume_listener->move_listener.link);
+             wl_list_remove(&_volume_listener->restack_listener.link);
              E_FREE(_volume_listener);
              _volume_listener = NULL;
           }