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

texture-async: Fix path fallback code

Browse Source 
And error out in case of load failure.
This commit is contained in:
Emmanuele Bassi 2010-06-08 11:19:28 +01:00
parent 759ea5ce45
commit 00675f42aa
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/interactive/test-texture-async.c
View File

@ -80,7 +80,15 @@ gboolean task (gpointer user_data)
GINT_TO_POINTER (LOAD_ASYNC)); GINT_TO_POINTER (LOAD_ASYNC));
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
clutter_texture_set_from_file (CLUTTER_TEXTURE (image[i]), path, NULL); {
GError *error = NULL;
clutter_texture_set_from_file (CLUTTER_TEXTURE (image[i]), path, &error);
if (error != NULL)
g_error ("Unable to load image at '%s': %s",
path != NULL ? path : "<unknown>",
error->message);
}
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
clutter_container_add (CLUTTER_CONTAINER (stage), image[i], NULL); clutter_container_add (CLUTTER_CONTAINER (stage), image[i], NULL);
@ -129,11 +137,11 @@ test_texture_async_main (int argc, char *argv[])
error = NULL; error = NULL;
path = (argc > 0) path = (argc > 1)
? g_strdup (argv[1]) ? g_strdup (argv[1])
: g_build_filename (TESTS_DATADIR, "redhand.png", NULL); : g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
g_timeout_add (500, task, path); clutter_threads_add_timeout (500, task, path);
clutter_main (); clutter_main ();