brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

data-device: Don't look up the same client twice in two different ways

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-07-10 10:41:30 -04:00
parent 581335fbea
commit 59fa74fed1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wayland/meta-wayland-data-device.c
View File

@ -198,6 +198,7 @@ drag_grab_focus (MetaWaylandPointerGrab *grab,
{ {
MetaWaylandDragGrab *drag_grab = (MetaWaylandDragGrab*) grab; MetaWaylandDragGrab *drag_grab = (MetaWaylandDragGrab*) grab;
MetaWaylandSeat *seat = drag_grab->seat; MetaWaylandSeat *seat = drag_grab->seat;
struct wl_client *client;
struct wl_resource *resource, *offer = NULL; struct wl_resource *resource, *offer = NULL;
struct wl_display *display; struct wl_display *display;
guint32 serial; guint32 serial;
@ -221,13 +222,13 @@ drag_grab_focus (MetaWaylandPointerGrab *grab,
wl_resource_get_client (surface->resource) != drag_grab->drag_client) wl_resource_get_client (surface->resource) != drag_grab->drag_client)
return; return;
resource = client = wl_resource_get_client (surface->resource);
wl_resource_find_for_client (&seat->data_device_resource_list,
wl_resource_get_client (surface->resource)); resource = wl_resource_find_for_client (&seat->data_device_resource_list, client);
if (!resource) if (!resource)
return; return;
display = wl_client_get_display (wl_resource_get_client (resource)); display = wl_client_get_display (client);
serial = wl_display_next_serial (display); serial = wl_display_next_serial (display);
if (drag_grab->drag_data_source) if (drag_grab->drag_data_source)