From bdf1017f902e197d35be126863db992d5b663423 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Thu, 23 Jun 2016 11:26:57 -0500 Subject: [PATCH] Don't send configure to wl_shell popups This confuses Qt badly, and rightly so, because we shouldn't be doing it. --- src/modules/wl_desktop_shell/e_mod_main.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c index fc7808496..d5f78135d 100644 --- a/src/modules/wl_desktop_shell/e_mod_main.c +++ b/src/modules/wl_desktop_shell/e_mod_main.c @@ -475,6 +475,17 @@ static const struct wl_shell_surface_interface _e_shell_surface_interface = static void _e_shell_surface_configure_send(struct wl_resource *resource, uint32_t edges, int32_t width, int32_t height) { + E_Client *ec; + + if (!(ec = wl_resource_get_user_data(resource))) + { + wl_resource_post_error(resource, + WL_DISPLAY_ERROR_INVALID_OBJECT, + "No Client For Shell Surface"); + return; + } + if (e_client_util_is_popup(ec)) return; + wl_shell_surface_send_configure(resource, edges, width, height); }