isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Bug #952 - Fix test-textures in trunk

	* tests/test-textures.c: Use USE_GDKPIXBUF instead of
	USE_PIXBUF. (#952, Gwenole Beauchesne)
This commit is contained in:
Emmanuele Bassi 2008-06-06 14:56:08 +00:00
parent c2d8773e69
commit 80cc7351b7
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
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> 2008-06-06 Emmanuele Bassi <ebassi@openedhand.com>
Bug #951 - Fix clutter_entry_init() in trunk Bug #951 - Fix clutter_entry_init() in trunk

18
tests/test-textures.c
View File

@ -1,6 +1,13 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h>
#include <clutter/clutter.h> #include <clutter/clutter.h>
#ifdef USE_PIXBUF #ifdef USE_GDKPIXBUF
GdkPixbuf* GdkPixbuf*
make_pixbuf (int width, int height, int bpp, int has_alpha) 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)) \ #define SPIN() while (g_main_context_pending (NULL)) \
g_main_context_iteration (NULL, FALSE); g_main_context_iteration (NULL, FALSE);
#endif #endif /* USE_GDKPIXBUF */
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
#ifdef USE_PIXBUF #ifdef USE_GDKPIXBUF
ClutterActor *texture; ClutterActor *texture;
ClutterActor *stage; ClutterActor *stage;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
@ -107,6 +114,7 @@ main (int argc, char *argv[])
clutter_container_remove (CLUTTER_CONTAINER (stage), texture, NULL); clutter_container_remove (CLUTTER_CONTAINER (stage), texture, NULL);
} }
#endif #endif /* USE_GDKPIXBUF */
return 0;
return EXIT_SUCCESS;
} }