[gupnp-av: 3/6] Silence deprecation warning



commit 83302a3b8eeb9ec255482c9c6464678261fea5fc
Author: Jens Georg <mail jensge org>
Date:   Thu Nov 29 14:08:51 2012 +0100

    Silence deprecation warning

 tests/check-feature-list-parser.c   |    2 ++
 tests/check-search.c                |    2 ++
 tests/fragments.c                   |    2 ++
 tests/gtest/test-media-collection.c |    2 ++
 tests/gtest/test-regression.c       |    2 ++
 tests/test-search-criteria-parser.c |    2 ++
 6 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/tests/check-feature-list-parser.c b/tests/check-feature-list-parser.c
index 492d9ed..990920d 100644
--- a/tests/check-feature-list-parser.c
+++ b/tests/check-feature-list-parser.c
@@ -83,7 +83,9 @@ main (int argc, char **argv)
         GList                  *item;
         gboolean               success = TRUE;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
         g_type_init ();
+#endif
 
         parser = gupnp_feature_list_parser_new ();
 
diff --git a/tests/check-search.c b/tests/check-search.c
index 9f4bb4b..7916912 100644
--- a/tests/check-search.c
+++ b/tests/check-search.c
@@ -36,7 +36,9 @@ main (int argc, char **argv)
         GError *error;
         int i;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
         g_type_init ();
+#endif
 
         parser = gupnp_search_criteria_parser_new ();
 
diff --git a/tests/fragments.c b/tests/fragments.c
index 0ecb47b..44fb617 100644
--- a/tests/fragments.c
+++ b/tests/fragments.c
@@ -131,7 +131,9 @@ int main (void)
         GList* artists;
         GUPnPDIDLLiteContributor *artist;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
         g_type_init ();
+#endif
         g_setenv ("GUPNP_AV_DATADIR", ABS_TOP_SRCDIR G_DIR_SEPARATOR_S "data", FALSE);
 
         writer = gupnp_didl_lite_writer_new (NULL);
diff --git a/tests/gtest/test-media-collection.c b/tests/gtest/test-media-collection.c
index e9abfd1..75daf17 100644
--- a/tests/gtest/test-media-collection.c
+++ b/tests/gtest/test-media-collection.c
@@ -468,7 +468,9 @@ test_didl_collection_create_reparent ()
 
 int main (int argc, char *argv[])
 {
+#if !GLIB_CHECK_VERSION (2, 35, 0)
         g_type_init ();
+#endif
         g_test_init (&argc, &argv, NULL);
 
         g_test_add_func ("/didl/collection/construction",
diff --git a/tests/gtest/test-regression.c b/tests/gtest/test-regression.c
index e5bbedd..ed548e3 100644
--- a/tests/gtest/test-regression.c
+++ b/tests/gtest/test-regression.c
@@ -92,7 +92,9 @@ test_bgo687462 (void)
 
 int main (int argc, char *argv[])
 {
+#if !GLIB_CHECK_VERSION (2, 35, 0)
         g_type_init ();
+#endif
         g_test_init (&argc, &argv, NULL);
 
         g_test_add_func ("/bugs/gnome/674319", test_bgo674319);
diff --git a/tests/test-search-criteria-parser.c b/tests/test-search-criteria-parser.c
index e1fc1d9..7e49fba 100644
--- a/tests/test-search-criteria-parser.c
+++ b/tests/test-search-criteria-parser.c
@@ -71,7 +71,9 @@ main (int argc, char **argv)
 
         g_assert (argc == 2);
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
         g_type_init ();
+#endif
 
         parser = gupnp_search_criteria_parser_new ();
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]