brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged clutter-ivan branch into trunk.

Browse Source 
svn merge \
 https://svn.o-hand.com/repos/clutter/trunk/clutter@2509 \
 https://svn.o-hand.com/repos/clutter/branches/clutter-ivan@HEAD
This commit is contained in:
Neil Roberts
2008-04-25 13:37:36 +00:00
parent 7c3cf35eec
commit 6409b1adeb
123 changed files with 20528 additions and 3377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/clutter-script.c
View File

@ -160,6 +160,7 @@
#include <glib.h>
#include <glib-object.h>
#include <gmodule.h>
#include "clutter-actor.h"
#include "clutter-alpha.h"
@ -927,6 +928,7 @@ clutter_script_parse_node (ClutterScript *script,
break;
case G_TYPE_OBJECT:
#ifdef USE_GDKPIXBUF
if (G_VALUE_HOLDS (value, GDK_TYPE_PIXBUF))
{
if (G_VALUE_HOLDS (&node_value, G_TYPE_STRING))
@ -958,7 +960,7 @@ clutter_script_parse_node (ClutterScript *script,
g_warning ("Unable to open image at path `%s': %s",
path,
error->message);
g_error_free (error);
g_error_free (error);
}
else
{
@ -983,6 +985,7 @@ clutter_script_parse_node (ClutterScript *script,
}
}
break;
#endif
default:
retval = FALSE;