2008-06-06 Emmanuele Bassi <ebassi@openedhand.com>

	Bug #952 - Fix test-textures in trunk

	* tests/test-textures.c: Use USE_GDKPIXBUF instead of
	USE_PIXBUF. (#952, Gwenole Beauchesne)

diff --git a/ChangeLog b/ChangeLog
index 7739347..7a001e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-06-06  Emmanuele Bassi  <ebassi@openedhand.com>
 
+       Bug #952 - Fix test-textures in trunk
+
+       * tests/test-textures.c: Use USE_GDKPIXBUF instead of
+       USE_PIXBUF. (#952, Gwenole Beauchesne)
+
+2008-06-06  Emmanuele Bassi  <ebassi@openedhand.com>
+
        Bug #951 - Fix clutter_entry_init() in trunk
 
        * clutter/clutter-entry.c (clutter_entry_init): Remove a

diff --git a/tests/test-textures.c b/tests/test-textures.c
index bfcf8c1..6d213a0 100644 (file)
--- a/tests/test-textures.c
+++ b/tests/test-textures.c
@@ -1,6 +1,13 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+
 #include <clutter/clutter.h>
 
-#ifdef USE_PIXBUF
+#ifdef USE_GDKPIXBUF
+
 GdkPixbuf*
 make_pixbuf (int width, int height, int bpp, int has_alpha)
 {
@@ -49,12 +56,12 @@ make_pixbuf (int width, int height, int bpp, int has_alpha)
 #define SPIN()   while (g_main_context_pending (NULL)) \
                      g_main_context_iteration (NULL, FALSE);
 
-#endif
+#endif /* USE_GDKPIXBUF */
 
 int
 main (int argc, char *argv[])
 {
-#ifdef USE_PIXBUF
+#ifdef USE_GDKPIXBUF
   ClutterActor    *texture;
   ClutterActor    *stage;
   GdkPixbuf       *pixbuf;
@@ -107,6 +114,7 @@ main (int argc, char *argv[])
 
         clutter_container_remove (CLUTTER_CONTAINER (stage), texture, NULL);
     }
-#endif
-  return 0;
+#endif /* USE_GDKPIXBUF */
+
+  return EXIT_SUCCESS;
 }