[evolution-data-server/openismus-work] test-query.c: Dont use g_test_add_data_func_full with glib < 2.34
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/openismus-work] test-query.c: Dont use g_test_add_data_func_full with glib < 2.34
- Date: Fri, 25 Jan 2013 11:43:21 +0000 (UTC)
commit 269d4deb05179437d95c503ac48803703736dc63
Author: Tristan Van Berkom <tristanvb openismus com>
Date: Fri Jan 25 20:42:27 2013 +0900
test-query.c: Dont use g_test_add_data_func_full with glib < 2.34
tests/libebook/test-query.c | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/tests/libebook/test-query.c b/tests/libebook/test-query.c
index f2a155b..6bfe181 100644
--- a/tests/libebook/test-query.c
+++ b/tests/libebook/test-query.c
@@ -28,6 +28,17 @@ normalize_space (char *str)
}
static void
+test_data_free (gpointer data)
+{
+ TestData *const test = data;
+
+ e_book_query_unref (test->query);
+ g_free (test->sexp);
+
+ g_slice_free (TestData, test);
+}
+
+static void
test_query (gconstpointer data)
{
const TestData *const test = data;
@@ -47,17 +58,8 @@ test_query (gconstpointer data)
g_assert_cmpstr (test->sexp, ==, sexp);
g_free (sexp);
-}
-
-static void
-test_data_free (gpointer data)
-{
- TestData *const test = data;
- e_book_query_unref (test->query);
- g_free (test->sexp);
-
- g_slice_free (TestData, test);
+ test_data_free (data);
}
static void
@@ -70,7 +72,7 @@ add_query_test (const char *path,
data->sexp = g_strdup (sexp);
data->query = query;
- g_test_add_data_func_full (path, data, test_query, test_data_free);
+ g_test_add_data_func (path, data, test_query);
}
gint
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]