mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdg-shell: Remove the serial from popup_done

Browse Source 
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>
This commit is contained in:
Jasper St. Pierre
2015-02-13 14:01:56 +08:00
committed by Pekka Paalanen
parent 66bc949b72
commit ecf2a0f1ca
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+1 -1
View File
@@ -4727,7 +4727,7 @@ menu_redraw_handler(struct widget *widget, void *data)
} }
static void 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 window *window = data;
struct menu *menu = window->main_surface->widget->user_data; struct menu *menu = window->main_surface->widget->user_data;
desktop-shell/shell.c
+1 -2
View File
@@ -3315,8 +3315,7 @@ shell_surface_send_popup_done(struct shell_surface *shsurf)
if (shell_surface_is_wl_shell_surface(shsurf)) if (shell_surface_is_wl_shell_surface(shsurf))
wl_shell_surface_send_popup_done(shsurf->resource); wl_shell_surface_send_popup_done(shsurf->resource);
else if (shell_surface_is_xdg_popup(shsurf)) else if (shell_surface_is_xdg_popup(shsurf))
xdg_popup_send_popup_done(shsurf->resource, xdg_popup_send_popup_done(shsurf->resource);
shsurf->popup.serial);
} }
static void static void
protocol/xdg-shell.xml
-1
View File
@@ -415,7 +415,6 @@
that is, when the users clicks a surface that doesn't belong that is, when the users clicks a surface that doesn't belong
to the client owning the popup surface. to the client owning the popup surface.
</description> </description>
<arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/>
</event> </event>
</interface> </interface>