2007-08-06 Matthew Allum <mallum@openedhand.com>

        * clutter/clutter-texture.c:
        Correct set pixbuf property as GDK_TYPE_PIXBUF
        (fix via Neil Roberts)

diff --git a/ChangeLog b/ChangeLog
index 10e74de..967224d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-08-06  Matthew Allum  <mallum@openedhand.com>
 
+       * clutter/clutter-texture.c:
+       Correct set pixbuf property as GDK_TYPE_PIXBUF 
+       (fix via Neil Roberts)
+
+2007-08-06  Matthew Allum  <mallum@openedhand.com>
+
        * clutter/clutter-behaviour-depth.c:
        Modify to work like all other behvaiours in not forcing
        increasing order in behaviour 'limits'. (#436)

diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index a7eee07..c94b649 100644 (file)
--- 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,