wayland: Rename GdkDisplayWayland to GdkWaylandDisplay

[~andy/gtk] / gdk / wayland / gdkeventsource.c

diff --git a/gdk/wayland/gdkeventsource.c b/gdk/wayland/gdkeventsource.c
index 7a6c7048cdf7ea57452bd2c5975096f5072b3e9e..badbaaa2a0fbac324b611ac4c434bc057283f5ef 100644 (file)
--- a/gdk/wayland/gdkeventsource.c
+++ b/gdk/wayland/gdkeventsource.c
@@ -33,7 +33,7 @@ static gboolean
 gdk_event_source_prepare(GSource *base, gint *timeout)
 {
   GdkWaylandEventSource *source = (GdkWaylandEventSource *) base;
-  GdkDisplayWayland *display = (GdkDisplayWayland *) source->display;
+  GdkWaylandDisplay *display = (GdkWaylandDisplay *) source->display;
 
   *timeout = -1;
 
@@ -122,7 +122,7 @@ _gdk_wayland_display_event_source_new (GdkDisplay *display)
 {
   GSource *source;
   GdkWaylandEventSource *wl_source;
-  GdkDisplayWayland *display_wayland;
+  GdkWaylandDisplay *display_wayland;
   char *name;
 
   source = g_source_new (&wl_glib_source_funcs,
@@ -132,7 +132,7 @@ _gdk_wayland_display_event_source_new (GdkDisplay *display)
   g_free (name);
   wl_source = (GdkWaylandEventSource *) source;
 
-  display_wayland = GDK_DISPLAY_WAYLAND (display);
+  display_wayland = GDK_WAYLAND_DISPLAY (display);
   wl_source->display = display;
   wl_source->pfd.fd = wl_display_get_fd(display_wayland->wl_display,
                                        gdk_event_source_update, source);
@@ -154,17 +154,17 @@ _gdk_wayland_display_flush (GdkDisplay *display, GSource *source)
   GdkWaylandEventSource *wayland_source = (GdkWaylandEventSource *) source;
 
   while (wayland_source->mask & WL_DISPLAY_WRITABLE)
-    wl_display_iterate(GDK_DISPLAY_WAYLAND (display)->wl_display,
+    wl_display_iterate(GDK_WAYLAND_DISPLAY (display)->wl_display,
                       WL_DISPLAY_WRITABLE);
 }
 
 void
 _gdk_wayland_display_queue_events (GdkDisplay *display)
 {
-  GdkDisplayWayland *display_wayland;
+  GdkWaylandDisplay *display_wayland;
   GdkWaylandEventSource *source;
 
-  display_wayland = GDK_DISPLAY_WAYLAND (display);
+  display_wayland = GDK_WAYLAND_DISPLAY (display);
   source = (GdkWaylandEventSource *) display_wayland->event_source;
 
   if (source->pfd.revents)