[gtk+] wayland: Do not free wayland cursor buffers
- From: Kristian Høgsberg <krh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] wayland: Do not free wayland cursor buffers
- Date: Thu, 28 Mar 2013 14:34:37 +0000 (UTC)
commit 4801977d807f433fe061810090058524b2010582
Author: Chris Cummins <christopher e cummins intel com>
Date: Tue Mar 26 14:44:24 2013 +0000
wayland: Do not free wayland cursor buffers
The cursor buffer is only non-null when a cursor is created from pixbuf,
so it is not necessary to keep track of whether to free this buffer on
finalize.
gdk/wayland/gdkcursor-wayland.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
index e5f0ac1..8873813 100644
--- a/gdk/wayland/gdkcursor-wayland.c
+++ b/gdk/wayland/gdkcursor-wayland.c
@@ -60,7 +60,6 @@ struct _GdkWaylandCursor
} pixbuf;
struct wl_cursor *wl_cursor;
- gboolean free_buffer;
};
struct _GdkWaylandCursorClass
@@ -152,7 +151,6 @@ set_cursor_from_theme (GdkWaylandCursor *cursor, struct wl_cursor_theme *theme)
}
cursor->wl_cursor = c;
- cursor->free_buffer = FALSE;
return TRUE;
}
@@ -170,7 +168,7 @@ gdk_wayland_cursor_finalize (GObject *object)
GdkWaylandCursor *cursor = GDK_WAYLAND_CURSOR (object);
g_free (cursor->name);
- if (cursor->free_buffer)
+ if (cursor->pixbuf.buffer)
wl_buffer_destroy (cursor->pixbuf.buffer);
G_OBJECT_CLASS (_gdk_wayland_cursor_parent_class)->finalize (object);
@@ -402,7 +400,6 @@ _gdk_wayland_display_get_cursor_for_pixbuf (GdkDisplay *display,
cursor->pixbuf.height,
stride,
WL_SHM_FORMAT_ARGB8888);
- cursor->free_buffer = FALSE;
wl_shm_pool_destroy (pool);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]