sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

pointer: Make nested grabs work

Browse source 
Something noticed on code inspection. If we have a popup grab,
it will always return FALSE. The code here clearly meant to continue
if we had an existing popup grab from an existing client.
This commit is contained in:
Jasper St. Pierre 2014-02-18 18:06:55 -05:00
parent be16c2fe71
commit 756a412436
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/wayland/meta-wayland-pointer.c
View file

@ -589,15 +589,13 @@ meta_wayland_pointer_start_popup_grab (MetaWaylandPointer *pointer,
if (pointer->grab != &pointer->default_grab)
{
if (pointer->grab->interface == &popup_grab_interface)
{
grab = (MetaWaylandPopupGrab*)pointer->grab;
if (pointer->grab->interface != &popup_grab_interface)
return FALSE;
if (wl_resource_get_client (surface->resource) != grab->grab_client)
return FALSE;
}
grab = (MetaWaylandPopupGrab*)pointer->grab;
return FALSE;
if (wl_resource_get_client (surface->resource) != grab->grab_client)
return FALSE;
}
if (pointer->grab == &pointer->default_grab)