From f843b48eb235f541cf98bd2417abe4192fe75717 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 22 Apr 2015 14:54:49 -0400 Subject: [PATCH] update wl shell parent setting code to use clients instead of pixmaps ref T2354 --- src/modules/wl_desktop_shell/e_mod_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c index b42fb6264..ba57527c4 100644 --- a/src/modules/wl_desktop_shell/e_mod_main.c +++ b/src/modules/wl_desktop_shell/e_mod_main.c @@ -8,7 +8,6 @@ static void _e_shell_surface_parent_set(E_Client *ec, struct wl_resource *parent_resource) { - E_Pixmap *pp; E_Client *pc; uint64_t pwin = 0; @@ -25,16 +24,13 @@ _e_shell_surface_parent_set(E_Client *ec, struct wl_resource *parent_resource) } return; } - else if (!(pp = wl_resource_get_user_data(parent_resource))) + else if (!(pc = wl_resource_get_user_data(parent_resource))) { - ERR("Could not get parent resource pixmap"); + ERR("Could not get parent resource client"); return; } - pwin = e_pixmap_window_get(pp); - - /* find the parent client */ - pc = e_pixmap_client_get(pp); + pwin = e_pixmap_window_get(pc->pixmap); e_pixmap_parent_window_set(ec->pixmap, pwin); @@ -52,7 +48,7 @@ _e_shell_surface_parent_set(E_Client *ec, struct wl_resource *parent_resource) pc = NULL; } - if ((pc) && (pc != ec) && + if ((pc != ec) && (eina_list_data_find(pc->transients, ec) != ec)) { pc->transients = eina_list_append(pc->transients, ec);