From c21c0d64eb1dc1a5c249a6b90c1e130d40d3aaa8 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 26 May 2017 16:34:13 -0400 Subject: [PATCH] always run client icon update path when creating xdg6 role surface ensure that the client gets a desktop associated with it so that it can be matched to exec instances --- src/modules/wl_desktop_shell/xdg6.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules/wl_desktop_shell/xdg6.c b/src/modules/wl_desktop_shell/xdg6.c index 5c6246810..b341fd02f 100644 --- a/src/modules/wl_desktop_shell/xdg6.c +++ b/src/modules/wl_desktop_shell/xdg6.c @@ -936,7 +936,8 @@ _e_xdg_surface_cb_popup_get(struct wl_client *client, struct wl_resource *resour ec->lock_border = EINA_TRUE; if (!ec->internal) ec->border.changed = ec->changes.border = !ec->borderless; - ec->changes.icon = !!ec->icccm.class; + ec->changes.icon = 1; + EC_CHANGED(ec); ec->netwm.type = E_WINDOW_TYPE_POPUP_MENU; ec->placed = EINA_TRUE; @@ -1238,6 +1239,8 @@ _e_xdg_surface_cb_toplevel_get(struct wl_client *client EINA_UNUSED, struct wl_r if (!ec->internal) ec->borderless = 1; ec->lock_border = EINA_TRUE; + ec->changes.icon = 1; + EC_CHANGED(ec); if ((!ec->internal) || (!ec->borderless)) ec->border.changed = ec->changes.border = !ec->borderless; ec->netwm.type = E_WINDOW_TYPE_NORMAL;