From ecf2a0f1cacf0227a8ae432f354b8b74b4463117 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 13 Feb 2015 14:01:56 +0800 Subject: [PATCH] xdg-shell: Remove the serial from popup_done It doesn't serve any purpose, as it's a serial that the client gave to the server when starting the popup, which the client already has. Reviewed-by: Pekka Paalanen --- clients/window.c | 2 +- desktop-shell/shell.c | 3 +-- protocol/xdg-shell.xml | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/clients/window.c b/clients/window.c index 7b12227c8..d919210e6 100644 --- a/clients/window.c +++ b/clients/window.c @@ -4727,7 +4727,7 @@ menu_redraw_handler(struct widget *widget, void *data) } static void -handle_popup_popup_done(void *data, struct xdg_popup *xdg_popup, uint32_t serial) +handle_popup_popup_done(void *data, struct xdg_popup *xdg_popup) { struct window *window = data; struct menu *menu = window->main_surface->widget->user_data; diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 076b4549e..b081e3317 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -3315,8 +3315,7 @@ shell_surface_send_popup_done(struct shell_surface *shsurf) if (shell_surface_is_wl_shell_surface(shsurf)) wl_shell_surface_send_popup_done(shsurf->resource); else if (shell_surface_is_xdg_popup(shsurf)) - xdg_popup_send_popup_done(shsurf->resource, - shsurf->popup.serial); + xdg_popup_send_popup_done(shsurf->resource); } static void diff --git a/protocol/xdg-shell.xml b/protocol/xdg-shell.xml index 6abfabd21..d0a212457 100644 --- a/protocol/xdg-shell.xml +++ b/protocol/xdg-shell.xml @@ -415,7 +415,6 @@ that is, when the users clicks a surface that doesn't belong to the client owning the popup surface. -