]> Pileus Git - ~andy/gtk/commitdiff
wayland: Move the finalize function to allow a clear logical block of code
authorRob Bradford <rob@linux.intel.com>
Wed, 4 Apr 2012 13:05:27 +0000 (14:05 +0100)
committerRob Bradford <rob@linux.intel.com>
Mon, 16 Apr 2012 13:12:51 +0000 (14:12 +0100)
gdk/wayland/gdkwindow-wayland.c

index b2d90af9ed74866e32356b552c68ac1fde5ba440..c2a4e4c23b2a8f141b9205161286f3484a4c6343 100644 (file)
@@ -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)