[weston,2/6] xdg-shell: Remove the serial from popup_done

Submitted by Jasper St. Pierre on Nov. 22, 2014, 8:28 p.m.

Details

Message ID 1416688110-21188-3-git-send-email-jstpierre@mecheye.net
State Accepted
Commit ecf2a0f1cacf0227a8ae432f354b8b74b4463117
Headers show

Not browsing as part of any series.

Commit Message

Jasper St. Pierre Nov. 22, 2014, 8:28 p.m.
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.
---
 clients/window.c       | 2 +-
 desktop-shell/shell.c  | 3 +--
 protocol/xdg-shell.xml | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/clients/window.c b/clients/window.c
index 5f86db2..103409e 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -4691,7 +4691,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 9e8d45a..4299977 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -3203,8 +3203,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 6abfabd..d0a2124 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>