app: remove add_task/execute_pending support

[staging/windowmanager.git] / src / wayland.cpp

diff --git a/src/wayland.cpp b/src/wayland.cpp
index df601eb..8e089c3 100644 (file)
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -438,10 +438,8 @@ void controller::layer_screen(struct layer * /*l*/, struct wl_output *screen) {
 
 void controller::layer_destroyed(struct layer *l) {
    logdebug("genivi::layer %s @ %p", __func__, this->proxy.get());
-   this->chooks->add_task("remove layer", [l, this] {
-      this->lprops.erase(l->id);
-      this->layers.erase(l->id);
-   });
+   this->lprops.erase(l->id);
+   this->layers.erase(l->id);
 }
 
 //                  __
@@ -674,10 +672,8 @@ void controller::surface_content(struct surface *s, int32_t content_state) {
    if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) {
       // XXX is this the right thing to do?
       this->chooks->surface_removed(s->id);
-      this->chooks->add_task("remove surface", [this, s] {
-         this->sprops.erase(s->id);
-         this->surfaces.erase(s->id);
-      });
+      this->sprops.erase(s->id);
+      this->surfaces.erase(s->id);
    }
 }