diff --git a/ChangeLog b/ChangeLog index 4ece3e6c1..c50093802 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-06-13 Emmanuele Bassi + + * clutter/clutter-actor.c: + * clutter/clutter-actor.h: + * tests/test-cogl-primitives.c: + * tests/test-events.c: + * tests/test-multistage.c: + * tests/test-textures.c: + * tests/test-timeline.c: Miscellaneous fixes for distcheck to + pass. + 2008-06-13 Emmanuele Bassi * clutter/clutter-texture.c: diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index d4e5858f7..3d76e7aa2 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -3257,10 +3257,10 @@ clutter_actor_get_preferred_height (ClutterActor *self, /** * clutter_actor_get_allocation_coords: * @self: A #ClutterActor - * @x1: x1 coord - * @y1: y1 coord - * @x2: x2 coord - * @y2: y2 coord + * @x_1: x1 coordinate + * @y_1: y1 coordinate + * @x_2: x2 coordinate + * @y_2: y2 coordinate * * Gets the layout box an actor has been assigned. The allocation can * only be assumed valid inside a paint() method; anywhere else, it @@ -3275,10 +3275,10 @@ clutter_actor_get_preferred_height (ClutterActor *self, */ void clutter_actor_get_allocation_coords (ClutterActor *self, - gint *x1, - gint *y1, - gint *x2, - gint *y2) + gint *x_1, + gint *y_1, + gint *x_2, + gint *y_2) { ClutterActorBox allocation = { 0, }; @@ -3286,17 +3286,17 @@ clutter_actor_get_allocation_coords (ClutterActor *self, clutter_actor_get_allocation_box (self, &allocation); - if (x1) - *x1 = CLUTTER_UNITS_TO_DEVICE (allocation.x1); + if (x_1) + *x_1 = CLUTTER_UNITS_TO_DEVICE (allocation.x1); - if (y1) - *y1 = CLUTTER_UNITS_TO_DEVICE (allocation.y1); + if (y_1) + *y_1 = CLUTTER_UNITS_TO_DEVICE (allocation.y1); - if (x2) - *x2 = CLUTTER_UNITS_TO_DEVICE (allocation.x2); + if (x_2) + *x_2 = CLUTTER_UNITS_TO_DEVICE (allocation.x2); - if (y2) - *y2 = CLUTTER_UNITS_TO_DEVICE (allocation.y2); + if (y_2) + *y_2 = CLUTTER_UNITS_TO_DEVICE (allocation.y2); } /** diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h index 88b077890..29e79a9b6 100644 --- a/clutter/clutter-actor.h +++ b/clutter/clutter-actor.h @@ -302,10 +302,10 @@ void clutter_actor_allocate (ClutterActor const ClutterActorBox *box, gboolean absolute_origin_changed); void clutter_actor_get_allocation_coords (ClutterActor *self, - gint *x1, - gint *y1, - gint *x2, - gint *y2); + gint *x_1, + gint *y_1, + gint *x_2, + gint *y_2); void clutter_actor_get_allocation_box (ClutterActor *self, ClutterActorBox *box); void clutter_actor_get_allocation_geometry (ClutterActor *self, diff --git a/tests/test-cogl-primitives.c b/tests/test-cogl-primitives.c index 5ef7590d1..494df9602 100644 --- a/tests/test-cogl-primitives.c +++ b/tests/test-cogl-primitives.c @@ -194,6 +194,7 @@ test_coglbox_paint(ClutterActor *self) { timer = g_timer_new (); g_timer_start (timer); + paint_index = 0; } if (g_timer_elapsed (timer, NULL) >= 1) diff --git a/tests/test-events.c b/tests/test-events.c index 6e53e4ab1..b689fea43 100644 --- a/tests/test-events.c +++ b/tests/test-events.c @@ -184,7 +184,7 @@ input_cb (ClutterActor *actor, if (clutter_event_get_source (event) == actor) g_print (" *source*"); - g_printf("\n"); + g_print ("\n"); return FALSE; } diff --git a/tests/test-multistage.c b/tests/test-multistage.c index e1b5498a5..ae6b28bc9 100644 --- a/tests/test-multistage.c +++ b/tests/test-multistage.c @@ -8,6 +8,8 @@ tex_button_cb (ClutterActor *actor, gpointer data) { clutter_actor_hide (actor); + + return TRUE; } static gboolean diff --git a/tests/test-textures.c b/tests/test-textures.c index 2a770003a..ea5dfa250 100644 --- a/tests/test-textures.c +++ b/tests/test-textures.c @@ -11,7 +11,7 @@ make_rgba_data (int width, int height, int bpp, int has_alpha, int *rowstride_p) { #define CHECK_SIZE 20 - gint x,y, rowstride, n_channels, i = 0; + gint x,y, rowstride, i = 0; guchar *pixels; g_assert(bpp == 4); diff --git a/tests/test-timeline.c b/tests/test-timeline.c index 39c9b4eb4..2a7ff3abf 100644 --- a/tests/test-timeline.c +++ b/tests/test-timeline.c @@ -1,5 +1,6 @@ #include #include +#include #include static void @@ -59,7 +60,7 @@ timeline_3_marker_reached (ClutterTimeline *timeline, const gchar *marker_name, guint frame_num) { - g_print ("2: Marker `%s' (%d) reached\n", marker_name, frame_num); + g_print ("3: Marker `%s' (%d) reached\n", marker_name, frame_num); } int @@ -105,7 +106,7 @@ main (int argc, char **argv) NULL); g_signal_connect (timeline_2, - "marker-reached::bar", G_CALLBACK (timeline_1_marker_reached), + "marker-reached::bar", G_CALLBACK (timeline_2_marker_reached), NULL); g_signal_connect (timeline_2, "new-frame", G_CALLBACK (timeline_2_new_frame_cb), @@ -115,7 +116,7 @@ main (int argc, char **argv) NULL); g_signal_connect (timeline_3, - "marker-reached", G_CALLBACK (timeline_1_marker_reached), + "marker-reached", G_CALLBACK (timeline_3_marker_reached), NULL); g_signal_connect (timeline_3, "new-frame", G_CALLBACK (timeline_3_new_frame_cb),