diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2015-02-13 14:01:56 +0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-02-27 14:58:57 +0200 |
| commit | ecf2a0f1cacf0227a8ae432f354b8b74b4463117 (patch) | |
| tree | 8554efe6285fec577e6fc8ce91454225a0c3b065 | |
| parent | 66bc949b72efeebd36f8c7ac2264dbbcff9d4a29 (diff) | |
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 <pekka.paalanen@collabora.co.uk>
| -rw-r--r-- | clients/window.c | 2 | ||||
| -rw-r--r-- | desktop-shell/shell.c | 3 | ||||
| -rw-r--r-- | protocol/xdg-shell.xml | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/clients/window.c b/clients/window.c index 7b12227c..d919210e 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 076b4549..b081e331 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 6abfabd2..d0a21245 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. </description> - <arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/> </event> </interface> |