From d9ca1a86363f6f0409460912a810b544c9c00ce1 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Wed, 4 Apr 2012 14:05:27 +0100 Subject: [PATCH] wayland: Move the finalize function to allow a clear logical block of code --- gdk/wayland/gdkwindow-wayland.c | 35 +++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index b2d90af9ed..c2a4e4c23b 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -369,23 +369,6 @@ gdk_wayland_window_attach_image (GdkWindow *window) wl_surface_attach (impl->surface, data->buffer, dx, dy); } -static void -gdk_window_impl_wayland_finalize (GObject *object) -{ - GdkWindowImplWayland *impl; - - g_return_if_fail (GDK_IS_WINDOW_IMPL_WAYLAND (object)); - - impl = GDK_WINDOW_IMPL_WAYLAND (object); - - if (impl->cursor) - g_object_unref (impl->cursor); - if (impl->server_surface) - cairo_surface_destroy (impl->server_surface); - - G_OBJECT_CLASS (_gdk_window_impl_wayland_parent_class)->finalize (object); -} - static void gdk_wayland_cairo_surface_destroy (void *p) { @@ -464,6 +447,24 @@ gdk_wayland_window_ref_cairo_surface (GdkWindow *window) return impl->cairo_surface; } + +static void +gdk_window_impl_wayland_finalize (GObject *object) +{ + GdkWindowImplWayland *impl; + + g_return_if_fail (GDK_IS_WINDOW_IMPL_WAYLAND (object)); + + impl = GDK_WINDOW_IMPL_WAYLAND (object); + + if (impl->cursor) + g_object_unref (impl->cursor); + if (impl->server_surface) + cairo_surface_destroy (impl->server_surface); + + G_OBJECT_CLASS (_gdk_window_impl_wayland_parent_class)->finalize (object); +} + static void gdk_wayland_window_configure (GdkWindow *window, int width, int height, int edges)