packaging/0002-wayland-Move-the-finalize-function-to-allow-a-clear-.patch

   1 From 4dab66cd7f8e7c5bd22e3b5ca30167157e8a7b65 Mon Sep 17 00:00:00 2001
   2 From: Rob Bradford <rob@linux.intel.com>
   3 Date: Wed, 4 Apr 2012 14:05:27 +0100
   4 Subject: [PATCH 2/7] wayland: Move the finalize function to allow a clear logical block of code
   5
   6 ---
   7  gdk/wayland/gdkwindow-wayland.c |   35 ++++++++++++++++++-----------------
   8  1 files changed, 18 insertions(+), 17 deletions(-)
   9
  10 diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
  11 index b2d90af..c2a4e4c 100644
  12 --- a/gdk/wayland/gdkwindow-wayland.c
  13 +++ b/gdk/wayland/gdkwindow-wayland.c
  14 @@ -370,23 +370,6 @@ gdk_wayland_window_attach_image (GdkWindow *window)
  15  }
  16
  17  static void
  18 -gdk_window_impl_wayland_finalize (GObject *object)
  19 -{
  20 -  GdkWindowImplWayland *impl;
  21 -
  22 -  g_return_if_fail (GDK_IS_WINDOW_IMPL_WAYLAND (object));
  23 -
  24 -  impl = GDK_WINDOW_IMPL_WAYLAND (object);
  25 -
  26 -  if (impl->cursor)
  27 -    g_object_unref (impl->cursor);
  28 -  if (impl->server_surface)
  29 -    cairo_surface_destroy (impl->server_surface);
  30 -
  31 -  G_OBJECT_CLASS (_gdk_window_impl_wayland_parent_class)->finalize (object);
  32 -}
  33 -
  34 -static void
  35  gdk_wayland_cairo_surface_destroy (void *p)
  36  {
  37    GdkWaylandCairoSurfaceData *data = p;
  38 @@ -464,6 +447,24 @@ gdk_wayland_window_ref_cairo_surface (GdkWindow *window)
  39    return impl->cairo_surface;
  40  }
  41
  42 +
  43 +static void
  44 +gdk_window_impl_wayland_finalize (GObject *object)
  45 +{
  46 +  GdkWindowImplWayland *impl;
  47 +
  48 +  g_return_if_fail (GDK_IS_WINDOW_IMPL_WAYLAND (object));
  49 +
  50 +  impl = GDK_WINDOW_IMPL_WAYLAND (object);
  51 +
  52 +  if (impl->cursor)
  53 +    g_object_unref (impl->cursor);
  54 +  if (impl->server_surface)
  55 +    cairo_surface_destroy (impl->server_surface);
  56 +
  57 +  G_OBJECT_CLASS (_gdk_window_impl_wayland_parent_class)->finalize (object);
  58 +}
  59 +
  60  static void
  61  gdk_wayland_window_configure (GdkWindow *window,
  62                               int width, int height, int edges)
  63 --
  64 1.7.1
  65