diff --git a/ChangeLog b/ChangeLog index e59911efb..d5e5a81b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2008-11-18 Neil Roberts + + 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 * tests/conform/test-timeline.c (test_timeline): Remove the delay diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c index 95c69036e..d4b23754e 100644 --- a/clutter/clutter-script.c +++ b/clutter/clutter-script.c @@ -2323,7 +2323,8 @@ clutter_script_add_search_paths (ClutterScript *script, for (i = 0; i < n_paths; i++, iter++) 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, g_strv_length (new_paths)); diff --git a/tests/interactive/test-animation.c b/tests/interactive/test-animation.c index b90e912d5..0af76c8a0 100644 --- a/tests/interactive/test-animation.c +++ b/tests/interactive/test-animation.c @@ -22,7 +22,7 @@ on_button_press (ClutterActor *actor, { ClutterAnimation *animation; 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; clutter_actor_get_position (actor, &old_x, &old_y); diff --git a/tests/interactive/test-easing.c b/tests/interactive/test-easing.c index ad3a88ff7..555aa3c3a 100644 --- a/tests/interactive/test-easing.c +++ b/tests/interactive/test-easing.c @@ -33,8 +33,8 @@ on_button_press (ClutterActor *actor, ClutterAnimation *animation; ClutterAnimationMode cur_mode; gchar *text; - gint stage_width, stage_height; - gint label_width, label_height; + guint stage_width, stage_height; + guint label_width, label_height; text = g_strdup_printf ("Easing mode: %s (%d of %d)\n", easing_modes[current_mode].name, @@ -71,8 +71,8 @@ test_easing_main (int argc, char *argv[]) ClutterColor stage_color = { 0x66, 0x66, 0xdd, 0xff }; ClutterColor rect_color = { 0x44, 0xdd, 0x44, 0xff }; gchar *text; - gint stage_width, stage_height; - gint label_width, label_height; + guint stage_width, stage_height; + guint label_width, label_height; clutter_init (&argc, &argv); diff --git a/tests/interactive/test-pixmap.c b/tests/interactive/test-pixmap.c index 17451dcbe..c1ef63959 100644 --- a/tests/interactive/test-pixmap.c +++ b/tests/interactive/test-pixmap.c @@ -94,7 +94,7 @@ create_pixmap (guint *width, guint *height, guint *depth) pixbuf = gdk_pixbuf_new_from_file (IMAGE, &error); if (error) - g_error (error->message); + g_error ("%s", error->message); /* We assume that the image had an alpha channel */ g_assert (gdk_pixbuf_get_has_alpha (pixbuf));