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

wayland: Small code cleanup in meta_wayland_drag_grab_set_focus()

Browse Source 
There's enough instances of drag_grab->drag_data_source to make it
nicer getting a "source" variable first.
This commit is contained in:
Carlos Garnacho 2016-03-09 16:44:25 +01:00
parent 9df99d8bac
commit f8c70491b9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -729,6 +729,7 @@ meta_wayland_drag_grab_set_focus (MetaWaylandDragGrab *drag_grab,
MetaWaylandSurface *surface) MetaWaylandSurface *surface)
{ {
MetaWaylandSeat *seat = drag_grab->seat; MetaWaylandSeat *seat = drag_grab->seat;
MetaWaylandDataSource *source = drag_grab->drag_data_source;
struct wl_client *client; struct wl_client *client;
struct wl_resource *data_device_resource, *offer = NULL; struct wl_resource *data_device_resource, *offer = NULL;
@ -741,13 +742,13 @@ meta_wayland_drag_grab_set_focus (MetaWaylandDragGrab *drag_grab,
drag_grab->drag_focus = NULL; drag_grab->drag_focus = NULL;
} }
if (drag_grab->drag_data_source) if (source)
meta_wayland_data_source_set_current_offer (drag_grab->drag_data_source, NULL); meta_wayland_data_source_set_current_offer (source, NULL);
if (!surface) if (!surface)
return; return;
if (!drag_grab->drag_data_source && if (!source &&
wl_resource_get_client (surface->resource) != drag_grab->drag_client) wl_resource_get_client (surface->resource) != drag_grab->drag_client)
return; return;
@ -755,9 +756,8 @@ meta_wayland_drag_grab_set_focus (MetaWaylandDragGrab *drag_grab,
data_device_resource = wl_resource_find_for_client (&seat->data_device.resource_list, client); data_device_resource = wl_resource_find_for_client (&seat->data_device.resource_list, client);
if (drag_grab->drag_data_source && data_device_resource) if (source && data_device_resource)
offer = meta_wayland_data_source_send_offer (drag_grab->drag_data_source, offer = meta_wayland_data_source_send_offer (source, data_device_resource);
data_device_resource);
drag_grab->drag_focus = surface; drag_grab->drag_focus = surface;
drag_grab->drag_focus_data_device = data_device_resource; drag_grab->drag_focus_data_device = data_device_resource;