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

Fixed some trivial compiler warnings

Browse Source 
* tests/interactive/test-pixmap.c (create_pixmap): Use a format
	string instead of passing the error message directly to g_error.

	* tests/interactive/test-easing.c (test_easing_main)
	(on_button_press):
	* tests/interactive/test-animation.c (on_button_press): Use
	unsigned variables for the results from clutter_actor_get_size
	otherwise it complains about the pointer signedness being
	different.

	* clutter/clutter-script.c (clutter_script_add_search_paths): Use
	G_GSIZE_FORMAT instead of %d for a gsize parameter otherwise it
	gets upset on 64-bit.
This commit is contained in:
Neil Roberts 2008-11-18 18:53:10 +00:00
parent 7324db4a0c
commit eeab42b765
5 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
2008-11-18 Neil Roberts <neil@linux.intel.com>
Fixed some trivial compiler warnings
* tests/interactive/test-pixmap.c (create_pixmap): Use a format
string instead of passing the error message directly to g_error.
* tests/interactive/test-easing.c (test_easing_main)
(on_button_press):
* tests/interactive/test-animation.c (on_button_press): Use
unsigned variables for the results from clutter_actor_get_size
otherwise it complains about the pointer signedness being
different.
* clutter/clutter-script.c (clutter_script_add_search_paths): Use
G_GSIZE_FORMAT instead of %d for a gsize parameter otherwise it
gets upset on 64-bit.
2008-11-18 Neil Roberts <neil@linux.intel.com> 2008-11-18 Neil Roberts <neil@linux.intel.com>
* tests/conform/test-timeline.c (test_timeline): Remove the delay * tests/conform/test-timeline.c (test_timeline): Remove the delay

3
clutter/clutter-script.c
View File

@ -2323,7 +2323,8 @@ clutter_script_add_search_paths (ClutterScript *script,
for (i = 0; i < n_paths; i++, iter++) for (i = 0; i < n_paths; i++, iter++)
new_paths[iter] = g_strdup (paths[i]); new_paths[iter] = g_strdup (paths[i]);
CLUTTER_NOTE (SCRIPT, "Added %d new search paths (new size: %d)", CLUTTER_NOTE (SCRIPT,
"Added %" G_GSIZE_FORMAT " new search paths (new size: %d)",
n_paths, n_paths,
g_strv_length (new_paths)); g_strv_length (new_paths));

2
tests/interactive/test-animation.c
View File

@ -22,7 +22,7 @@ on_button_press (ClutterActor *actor,
{ {
ClutterAnimation *animation; ClutterAnimation *animation;
gint old_x, old_y, new_x, new_y; gint old_x, old_y, new_x, new_y;
gint old_width, old_height, new_width, new_height; guint old_width, old_height, new_width, new_height;
guint8 old_op, new_op; guint8 old_op, new_op;
clutter_actor_get_position (actor, &old_x, &old_y); clutter_actor_get_position (actor, &old_x, &old_y);

8
tests/interactive/test-easing.c
View File

@ -33,8 +33,8 @@ on_button_press (ClutterActor *actor,
ClutterAnimation *animation; ClutterAnimation *animation;
ClutterAnimationMode cur_mode; ClutterAnimationMode cur_mode;
gchar *text; gchar *text;
gint stage_width, stage_height; guint stage_width, stage_height;
gint label_width, label_height; guint label_width, label_height;
text = g_strdup_printf ("Easing mode: %s (%d of %d)\n", text = g_strdup_printf ("Easing mode: %s (%d of %d)\n",
easing_modes[current_mode].name, easing_modes[current_mode].name,
@ -71,8 +71,8 @@ test_easing_main (int argc, char *argv[])
ClutterColor stage_color = { 0x66, 0x66, 0xdd, 0xff }; ClutterColor stage_color = { 0x66, 0x66, 0xdd, 0xff };
ClutterColor rect_color = { 0x44, 0xdd, 0x44, 0xff }; ClutterColor rect_color = { 0x44, 0xdd, 0x44, 0xff };
gchar *text; gchar *text;
gint stage_width, stage_height; guint stage_width, stage_height;
gint label_width, label_height; guint label_width, label_height;
clutter_init (&argc, &argv); clutter_init (&argc, &argv);

2
tests/interactive/test-pixmap.c
View File

@ -94,7 +94,7 @@ create_pixmap (guint *width, guint *height, guint *depth)
pixbuf = gdk_pixbuf_new_from_file (IMAGE, &error); pixbuf = gdk_pixbuf_new_from_file (IMAGE, &error);
if (error) if (error)
g_error (error->message); g_error ("%s", error->message);
/* We assume that the image had an alpha channel */ /* We assume that the image had an alpha channel */
g_assert (gdk_pixbuf_get_has_alpha (pixbuf)); g_assert (gdk_pixbuf_get_has_alpha (pixbuf));