2007-10-25 Emmanuele Bassi <ebassi@openedhand.com>

* clutter/clutter-texture.c (clutter_texture_set_property): Do
	not try to set NULL pixbufs.
This commit is contained in:
Emmanuele Bassi 2007-10-25 14:37:41 +00:00
parent f0f043cb19
commit 33ef32d7cd
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2007-10-25 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-texture.c (clutter_texture_set_property): Do
not try to set NULL pixbufs.
2007-10-25 Emmanuele Bassi <ebassi@openedhand.com> 2007-10-25 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-actor.c: Implement part of the ClutterScriptable * clutter/clutter-actor.c: Implement part of the ClutterScriptable

View File

@ -797,9 +797,10 @@ clutter_texture_set_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_PIXBUF: case PROP_PIXBUF:
clutter_texture_set_pixbuf (texture, if (g_value_get_object (value))
GDK_PIXBUF (g_value_get_object (value)), clutter_texture_set_pixbuf (texture,
NULL); GDK_PIXBUF (g_value_get_object (value)),
NULL);
break; break;
case PROP_USE_TILES: case PROP_USE_TILES:
priv->is_tiled = g_value_get_boolean (value); priv->is_tiled = g_value_get_boolean (value);