From b3c8ff186c53ae02cc76d2a7b4536b50ce618d35 Mon Sep 17 00:00:00 2001 From: Matthew Allum Date: Mon, 6 Aug 2007 12:48:13 +0000 Subject: [PATCH] 2007-08-06 Matthew Allum * clutter/clutter-texture.c: Correct set pixbuf property as GDK_TYPE_PIXBUF (fix via Neil Roberts) --- ChangeLog | 6 ++++++ clutter/clutter-texture.c | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10e74def7..967224da0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-08-06 Matthew Allum + + * clutter/clutter-texture.c: + Correct set pixbuf property as GDK_TYPE_PIXBUF + (fix via Neil Roberts) + 2007-08-06 Matthew Allum * clutter/clutter-behaviour-depth.c: diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c index a7eee07cd..c94b6498d 100644 --- a/clutter/clutter-texture.c +++ b/clutter/clutter-texture.c @@ -795,7 +795,7 @@ clutter_texture_set_property (GObject *object, { case PROP_PIXBUF: clutter_texture_set_pixbuf (texture, - (GdkPixbuf*)g_value_get_pointer(value), + GDK_PIXBUF (g_value_get_object (value)), NULL); break; case PROP_USE_TILES: @@ -846,7 +846,7 @@ clutter_texture_get_property (GObject *object, { GdkPixbuf *pixb; pixb = clutter_texture_get_pixbuf (texture); - g_value_set_pointer (value, pixb); + g_value_set_object (value, pixb); } break; case PROP_USE_TILES: @@ -903,10 +903,11 @@ clutter_texture_class_init (ClutterTextureClass *klass) g_object_class_install_property (gobject_class, PROP_PIXBUF, - g_param_spec_pointer ("pixbuf", - "Pixbuf source for Texture.", - "Pixbuf source for Texture.", - CLUTTER_PARAM_READWRITE)); + g_param_spec_object ("pixbuf", + "Pixbuf source for Texture.", + "Pixbuf source for Texture.", + GDK_TYPE_PIXBUF, + CLUTTER_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_USE_TILES,