jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

verify shell client delete functions are operating on wayland clients. 

ref cc795bfbda

Fixes T4958

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2016-12-02 09:29:44 -05:00
parent cc795bfbda
commit 7d8266995d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/wl_desktop_shell/xdg5.c
View File

@ -881,9 +881,13 @@ _e_xdg_shell_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t
static void
_xdg5_client_hook_del(void *d EINA_UNUSED, E_Client *ec)
{
E_Shell_Data *shd = ec->comp_data->shell.data;
E_Shell_Data *shd;
if (shd && (shd->version != 5)) return;
/* make sure this is a wayland client */
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
shd = ec->comp_data->shell.data;
if (shd && (shd->version != 5)) return;
if (ec->comp_data->shell.surface)
e_shell_surface_cb_destroy(ec->comp_data->shell.surface);
}

3
src/modules/wl_desktop_shell/xdg6.c
View File

@ -1325,6 +1325,9 @@ _xdg6_client_destroy(E_Client *ec)
{
E_Shell_Data *shd;
/* make sure this is a wayland client */
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
shd = ec->comp_data->shell.data;
if (shd && (shd->version != 6)) return;
if (ec->comp_data->shell.surface)