From 9ef66f7fae8df011f5efa5e4d65030f0216d1282 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Tue, 10 Mar 2015 15:52:31 -0400 Subject: [PATCH] Wayland: Don't consume serials when not sending events Reviewers: zmike, devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2134 --- src/modules/wl_desktop_shell/e_mod_main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c index 9ced6fd78..15ae58a9c 100644 --- a/src/modules/wl_desktop_shell/e_mod_main.c +++ b/src/modules/wl_desktop_shell/e_mod_main.c @@ -659,10 +659,11 @@ _e_xdg_shell_surface_configure_send(struct wl_resource *resource, uint32_t edges if (ec->focused) _e_xdg_surface_state_add(resource, &states, XDG_SURFACE_STATE_ACTIVATED); - serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp); if (ec->netwm.type != E_WINDOW_TYPE_POPUP_MENU) - xdg_surface_send_configure(resource, width, height, &states, serial); - + { + serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp); + xdg_surface_send_configure(resource, width, height, &states, serial); + } wl_array_release(&states); } @@ -1056,9 +1057,11 @@ _e_xdg_shell_surface_ping(struct wl_resource *resource) return; } - serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp); if (ec->comp->wl_comp_data->shell_interface.xdg_shell) - xdg_shell_send_ping(ec->comp->wl_comp_data->shell_interface.xdg_shell, serial); + { + serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp); + xdg_shell_send_ping(ec->comp->wl_comp_data->shell_interface.xdg_shell, serial); + } } static void