diff options
| author | Rob Bradford <rob@linux.intel.com> | 2013-07-22 17:31:38 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-08-12 16:54:10 -0700 |
| commit | 880ebc7ed9c16fc3aa4c1cf0601909c72a9348e9 (patch) | |
| tree | b5ed73f8da0853972d71839dff1cce4b483887f0 /src/data-device.c | |
| parent | 4384a24a9eb9c61c81f8875a1de7e4bf1b8db9d4 (diff) | |
| download | weston-880ebc7ed9c16fc3aa4c1cf0601909c72a9348e9.tar.gz | |
input: For serial generation get the display from the compositor
This removes the use of wl_client_get_display() where the client is
derived from the focussed resource. This starts the removal of the
assumption of a single resource on a client that would be notified about
events on the focussed surface.
Diffstat (limited to 'src/data-device.c')
| -rw-r--r-- | src/data-device.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/data-device.c b/src/data-device.c index 46081d4f..4bf62567 100644 --- a/src/data-device.c +++ b/src/data-device.c @@ -210,7 +210,7 @@ weston_drag_set_focus(struct weston_drag *drag, struct weston_surface *surface, { struct weston_pointer *pointer = drag->grab.pointer; struct wl_resource *resource, *offer = NULL; - struct wl_display *display; + struct wl_display *display = pointer->seat->compositor->wl_display; uint32_t serial; if (drag->focus_resource) { @@ -232,7 +232,6 @@ weston_drag_set_focus(struct weston_drag *drag, struct weston_surface *surface, if (!resource) return; - display = wl_client_get_display(wl_resource_get_client(resource)); serial = wl_display_next_serial(display); if (drag->data_source) |