From 664f6ef42056e3627b44dc657c4744cb477428ee Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 10 Jul 2014 10:15:34 -0400
Subject: [PATCH] wayland: Move DataOffer / DataSource into data-device
 internals

---
 src/wayland/meta-wayland-data-device.c | 13 +++++++++++++
 src/wayland/meta-wayland-seat.h        | 13 -------------
 src/wayland/meta-wayland-types.h       |  1 -
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c
index 88caa9d85..67f7578d8 100644
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -35,6 +35,19 @@
 #include "meta-wayland-pointer.h"
 #include "meta-wayland-private.h"
 
+typedef struct
+{
+  struct wl_resource *resource;
+  MetaWaylandDataSource *source;
+  struct wl_listener source_destroy_listener;
+} MetaWaylandDataOffer;
+
+struct _MetaWaylandDataSource
+{
+  struct wl_resource *resource;
+  struct wl_array mime_types;
+};
+
 static void
 data_offer_accept (struct wl_client *client,
                    struct wl_resource *resource,
diff --git a/src/wayland/meta-wayland-seat.h b/src/wayland/meta-wayland-seat.h
index e471ea1dc..68bad5820 100644
--- a/src/wayland/meta-wayland-seat.h
+++ b/src/wayland/meta-wayland-seat.h
@@ -30,19 +30,6 @@
 #include "meta-wayland-pointer.h"
 #include "meta-wayland-touch.h"
 
-struct _MetaWaylandDataOffer
-{
-  struct wl_resource *resource;
-  MetaWaylandDataSource *source;
-  struct wl_listener source_destroy_listener;
-};
-
-struct _MetaWaylandDataSource
-{
-  struct wl_resource *resource;
-  struct wl_array mime_types;
-};
-
 struct _MetaWaylandSeat
 {
   struct wl_list base_resource_list;
diff --git a/src/wayland/meta-wayland-types.h b/src/wayland/meta-wayland-types.h
index dd51c61c7..6951b31a2 100644
--- a/src/wayland/meta-wayland-types.h
+++ b/src/wayland/meta-wayland-types.h
@@ -27,7 +27,6 @@ typedef struct _MetaWaylandPointer MetaWaylandPointer;
 typedef struct _MetaWaylandPointerGrab MetaWaylandPointerGrab;
 typedef struct _MetaWaylandPointerGrabInterface MetaWaylandPointerGrabInterface;
 typedef struct _MetaWaylandKeyboard MetaWaylandKeyboard;
-typedef struct _MetaWaylandDataOffer MetaWaylandDataOffer;
 typedef struct _MetaWaylandDataSource MetaWaylandDataSource;
 typedef struct _MetaWaylandTouch MetaWaylandTouch;