enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Revert "when we get a request to close client app, defer resource deletion" 

This reverts commit 1cf7c1f151.

didn't fix the issue and obfuscated the code unnecessarily
This commit is contained in:
Mike Blumenkrantz 2015-03-05 11:41:43 -05:00
parent c9ef6e5c77
commit 230033aa67
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/e_comp_wl.c
View File

@ -148,9 +148,6 @@ _e_comp_wl_evas_cb_hide(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EIN
EINA_LIST_FOREACH(ec->e.state.video_child, l, tmp)
evas_object_hide(tmp->frame);
if ((ec->comp_data) && (ec->comp_data->delete_me))
wl_resource_destroy(ec->comp_data->surface);
}
static void
@ -1158,21 +1155,8 @@ unmapped:
static void
_e_comp_wl_surface_cb_destroy(struct wl_client *client EINA_UNUSED, struct wl_resource *resource)
{
E_Pixmap *ep;
E_Client *ec;
DBG("Surface Cb Destroy: %d", wl_resource_get_id(resource));
if (!(ep = wl_resource_get_user_data(resource))) return;
if (!(ec = e_pixmap_client_get(ep))) return;
if (ec->comp_data)
{
ec->comp_data->delete_me = EINA_TRUE;
evas_object_hide(ec->frame);
}
else
wl_resource_destroy(resource);
wl_resource_destroy(resource);
}
static void
@ -1371,6 +1355,7 @@ _e_comp_wl_surface_destroy(struct wl_resource *resource)
if (!(ec = e_pixmap_client_get(ep)))
return;
evas_object_hide(ec->frame);
e_object_del(E_OBJECT(ec));
}

1
src/bin/e_comp_wl.h
View File

@ -253,7 +253,6 @@ struct _E_Comp_Wl_Client_Data
int32_t x, y;
} popup;
Eina_Bool delete_me : 1;
Eina_Bool keep_buffer : 1;
Eina_Bool mapped : 1;
Eina_Bool change_icon : 1;