[mutter] seat: Reorder
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] seat: Reorder
- Date: Thu, 17 Apr 2014 23:16:16 +0000 (UTC)
commit 1be97f3d59be2a3a2bd42c327f6c7172192cc336
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Apr 17 18:57:25 2014 -0400
seat: Reorder
src/wayland/meta-wayland-seat.c | 22 +++++++++++-----------
src/wayland/meta-wayland-seat.h | 6 +++---
2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index 3484d08..bebaf6d 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -255,6 +255,17 @@ meta_wayland_seat_new (struct wl_display *display)
return seat;
}
+void
+meta_wayland_seat_free (MetaWaylandSeat *seat)
+{
+ set_cursor_surface (seat, NULL);
+
+ meta_wayland_pointer_release (&seat->pointer);
+ meta_wayland_keyboard_release (&seat->keyboard);
+
+ g_slice_free (MetaWaylandSeat, seat);
+}
+
static void
notify_motion (MetaWaylandSeat *seat,
const ClutterEvent *event)
@@ -493,14 +504,3 @@ meta_wayland_seat_repick (MetaWaylandSeat *seat,
meta_wayland_pointer_update_current_focus (pointer, surface);
}
-
-void
-meta_wayland_seat_free (MetaWaylandSeat *seat)
-{
- set_cursor_surface (seat, NULL);
-
- meta_wayland_pointer_release (&seat->pointer);
- meta_wayland_keyboard_release (&seat->keyboard);
-
- g_slice_free (MetaWaylandSeat, seat);
-}
diff --git a/src/wayland/meta-wayland-seat.h b/src/wayland/meta-wayland-seat.h
index a038e2e..1cd0c83 100644
--- a/src/wayland/meta-wayland-seat.h
+++ b/src/wayland/meta-wayland-seat.h
@@ -71,6 +71,9 @@ MetaWaylandSeat *
meta_wayland_seat_new (struct wl_display *display);
void
+meta_wayland_seat_free (MetaWaylandSeat *seat);
+
+void
meta_wayland_seat_update (MetaWaylandSeat *seat,
const ClutterEvent *event);
@@ -85,7 +88,4 @@ meta_wayland_seat_repick (MetaWaylandSeat *seat,
void
meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat);
-void
-meta_wayland_seat_free (MetaWaylandSeat *seat);
-
#endif /* __META_WAYLAND_SEAT_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]