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

don't create new wl shell clients for internal windows

This commit is contained in:
Mike Blumenkrantz 2015-03-12 14:42:00 -04:00
parent 08328f0c19
commit f1b47ca2af
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/wl_desktop_shell/e_mod_main.c
View File

@ -562,8 +562,9 @@ _e_shell_cb_shell_surface_get(struct wl_client *client, struct wl_resource *reso
/* find the client for this pixmap */
ec = e_pixmap_client_get(ep);
if (ec) e_pixmap_ref(ec->pixmap);
if (!(ec = e_client_new(NULL, ep, 0, 0)))
if (ec && (!ec->internal))
e_pixmap_ref(ec->pixmap);
if ((!ec) && (!ec->internal) && (!(ec = e_client_new(NULL, ep, 0, 0))))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -1136,8 +1137,9 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
/* find the client for this pixmap */
ec = e_pixmap_client_get(ep);
if (ec) e_pixmap_ref(ec->pixmap);
if (!(ec = e_client_new(NULL, ep, 0, 0)))
if (ec && (!ec->internal))
e_pixmap_ref(ec->pixmap);
if ((!ec) && (!ec->internal) && (!(ec = e_client_new(NULL, ep, 0, 0))))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -1232,8 +1234,9 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource
/* find the client for this pixmap */
ec = e_pixmap_client_get(ep);
if (ec) e_pixmap_ref(ec->pixmap);
if (!(ec = e_client_new(NULL, ep, 0, 0)))
if (ec && (!ec->internal))
e_pixmap_ref(ec->pixmap);
if ((!ec) && (!ec->internal) && (!(ec = e_client_new(NULL, ep, 0, 0))))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,