From: Mike Blumenkrantz Date: Tue, 21 Jul 2015 18:15:08 +0000 (-0400) Subject: do not attempt to remove wl xdg popup clients from focus stack X-Git-Tag: upstream/0.20.0~534 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7aea28a86b05c2f8cfbd6ab9212a18732d03bbeb;p=platform%2Fupstream%2Fenlightenment.git do not attempt to remove wl xdg popup clients from focus stack these have never been added to the focus stack, so removing them is useless --- diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c index 83d5558..c124439 100644 --- a/src/modules/wl_desktop_shell/e_mod_main.c +++ b/src/modules/wl_desktop_shell/e_mod_main.c @@ -1,4 +1,3 @@ -#define EXECUTIVE_MODE_ENABLED #define E_COMP_WL #include "e.h" #include "e_desktop_shell_protocol.h" @@ -1218,7 +1217,6 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource ec->new_client = ec->override = 1; e_client_unignore(ec); e_comp->new_clients++; - e_client_focus_stack_set(eina_list_remove(e_client_focus_stack_get(), ec)); if (!ec->internal) ec->borderless = !ec->internal_elm_win; ec->lock_border = EINA_TRUE; @@ -1228,7 +1226,6 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource ec->netwm.type = E_WINDOW_TYPE_POPUP_MENU; ec->comp_data->set_win_type = EINA_TRUE; evas_object_layer_set(ec->frame, E_LAYER_CLIENT_POPUP); - e_client_focus_stack_set(eina_list_remove(e_client_focus_stack_get(), ec)); /* set this client as a transient for parent */ _e_shell_surface_parent_set(ec, parent_resource);