From 8db571ff54db6f877f079014eb6020aab36f97d9 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 27 Aug 2013 08:47:16 -0400
Subject: [PATCH] tests: Fix compiler warnings

---
 tests/conform/actor-layout.c | 2 +-
 tests/conform/events-touch.c | 1 -
 tests/conform/texture-fbo.c  | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/conform/actor-layout.c b/tests/conform/actor-layout.c
index 6401f800a..cb7f31572 100644
--- a/tests/conform/actor-layout.c
+++ b/tests/conform/actor-layout.c
@@ -139,7 +139,7 @@ validate_state (gpointer data)
 
   /* avoid recursion */
   if (test_state_in_validation (state))
-    return;
+    return G_SOURCE_REMOVE;
 
   g_assert (state->actors != NULL);
   g_assert (state->colors != NULL);
diff --git a/tests/conform/events-touch.c b/tests/conform/events-touch.c
index 237a245ce..96f2f393e 100644
--- a/tests/conform/events-touch.c
+++ b/tests/conform/events-touch.c
@@ -148,7 +148,6 @@ screen_coords_to_device (int screen_x, int screen_y,
 static gboolean
 perform_gesture (gpointer data)
 {
-  State *state = data;
   int i;
 
   for (i = 0; i < TOUCH_POINTS; i++)
diff --git a/tests/conform/texture-fbo.c b/tests/conform/texture-fbo.c
index 5659bfe9a..4a30b383c 100644
--- a/tests/conform/texture-fbo.c
+++ b/tests/conform/texture-fbo.c
@@ -72,13 +72,12 @@ post_paint_clip_cb (void)
   cogl_clip_pop ();
 }
 
-static gboolean
+static void
 validate_part (TestState *state,
                int xpos, int ypos,
                int clip_flags)
 {
   int x, y;
-  gboolean pass = TRUE;
 
   /* Check whether the center of each division is the right color */
   for (y = 0; y < SOURCE_DIVISIONS_Y; y++)