[gtk+] wayland: Move the finalize function to allow a clear logical block of code
- From: Rob Bradford <rbradford src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] wayland: Move the finalize function to allow a clear logical block of code
- Date: Mon, 16 Apr 2012 14:27:22 +0000 (UTC)
commit d9ca1a86363f6f0409460912a810b544c9c00ce1
Author: Rob Bradford <rob linux intel com>
Date: Wed Apr 4 14:05:27 2012 +0100
wayland: Move the finalize function to allow a clear logical block of code
gdk/wayland/gdkwindow-wayland.c | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index b2d90af..c2a4e4c 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -370,23 +370,6 @@ gdk_wayland_window_attach_image (GdkWindow *window)
}
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)
{
GdkWaylandCairoSurfaceData *data = 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]