[Libosinfo] [PATCH libosinfo] build-sys: g_type_init() is deprecated in 2.36

Marc-André Lureau marcandre.lureau at gmail.com
Mon Jan 21 13:16:12 UTC 2013 

---
 test/test-db.c                | 2 ++
 test/test-device.c            | 2 ++
 test/test-devicelist.c        | 2 ++
 test/test-entity.c            | 2 ++
 test/test-filter.c            | 2 ++
 test/test-install-script.c    | 2 ++
 test/test-isodetect.c         | 2 ++
 test/test-list.c              | 2 ++
 test/test-loader.c            | 2 ++
 test/test-mediauris.c         | 2 ++
 test/test-os.c                | 2 ++
 test/test-oslist.c            | 2 ++
 test/test-platform.c          | 2 ++
 test/test-platformlist.c      | 2 ++
 test/test-product.c           | 2 ++
 test/test-productfilter.c     | 2 ++
 test/test-treeuris.c          | 2 ++
 tools/osinfo-db-validate.c    | 2 ++
 tools/osinfo-detect.c         | 2 ++
 tools/osinfo-install-script.c | 2 ++
 tools/osinfo-query.c          | 2 ++
 21 files changed, 42 insertions(+)

diff --git a/test/test-db.c b/test/test-db.c
index 50e29fe..576f40f 100644
--- a/test/test-db.c
+++ b/test/test-db.c
@@ -422,7 +422,9 @@ int main(void)
     Suite *s = list_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_entity_get_type();
diff --git a/test/test-device.c b/test/test-device.c
index 4612d27..4b9d3c6 100644
--- a/test/test-device.c
+++ b/test/test-device.c
@@ -55,7 +55,9 @@ int main(void)
     Suite *s = device_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_device_get_type();
diff --git a/test/test-devicelist.c b/test/test-devicelist.c
index 1fd001a..c3aa65f 100644
--- a/test/test-devicelist.c
+++ b/test/test-devicelist.c
@@ -224,7 +224,9 @@ int main(void)
     Suite *s = list_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_device_get_type();
diff --git a/test/test-entity.c b/test/test-entity.c
index 199307b..aeee513 100644
--- a/test/test-entity.c
+++ b/test/test-entity.c
@@ -335,7 +335,9 @@ int main(void)
     Suite *s = entity_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_dummy_get_type();
diff --git a/test/test-filter.c b/test/test-filter.c
index c6fbf4b..1a51370 100644
--- a/test/test-filter.c
+++ b/test/test-filter.c
@@ -172,7 +172,9 @@ int main(void)
     Suite *s = filter_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_device_get_type();
diff --git a/test/test-install-script.c b/test/test-install-script.c
index 4a3f16a..1068da9 100644
--- a/test/test-install-script.c
+++ b/test/test-install-script.c
@@ -277,7 +277,9 @@ int main(void)
     Suite *s = list_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_entity_get_type();
diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index a3460ff..efbc56a 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -403,7 +403,9 @@ int main(void)
     Suite *s = list_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_entity_get_type();
diff --git a/test/test-list.c b/test/test-list.c
index 0656799..bd82183 100644
--- a/test/test-list.c
+++ b/test/test-list.c
@@ -384,7 +384,9 @@ int main(void)
     Suite *s = list_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_dummy_get_type();
diff --git a/test/test-loader.c b/test/test-loader.c
index 7755600..3fe5c26 100644
--- a/test/test-loader.c
+++ b/test/test-loader.c
@@ -55,7 +55,9 @@ int main(void)
     Suite *s = loader_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_entity_get_type();
diff --git a/test/test-mediauris.c b/test/test-mediauris.c
index 85a2239..191e8c6 100644
--- a/test/test-mediauris.c
+++ b/test/test-mediauris.c
@@ -134,7 +134,9 @@ int main(void)
     if (!getenv("LIBOSINFO_NETWORK_TESTS"))
         return 77; /* Skip */
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_entity_get_type();
diff --git a/test/test-os.c b/test/test-os.c
index ecec8f5..8ea86df 100644
--- a/test/test-os.c
+++ b/test/test-os.c
@@ -143,7 +143,9 @@ int main(void)
     Suite *s = os_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_platform_get_type();
diff --git a/test/test-oslist.c b/test/test-oslist.c
index c3d114c..2fa97c6 100644
--- a/test/test-oslist.c
+++ b/test/test-oslist.c
@@ -224,7 +224,9 @@ int main(void)
     Suite *s = list_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_os_get_type();
diff --git a/test/test-platform.c b/test/test-platform.c
index 97c4c8b..92772a7 100644
--- a/test/test-platform.c
+++ b/test/test-platform.c
@@ -131,7 +131,9 @@ int main(void)
     Suite *s = platform_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_platform_get_type();
diff --git a/test/test-platformlist.c b/test/test-platformlist.c
index d191480..4baf4ff 100644
--- a/test/test-platformlist.c
+++ b/test/test-platformlist.c
@@ -224,7 +224,9 @@ int main(void)
     Suite *s = list_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_platform_get_type();
diff --git a/test/test-product.c b/test/test-product.c
index 412b6e1..f8f654c 100644
--- a/test/test-product.c
+++ b/test/test-product.c
@@ -205,7 +205,9 @@ int main(void)
     Suite *s = product_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_platform_get_type();
diff --git a/test/test-productfilter.c b/test/test-productfilter.c
index 7c9ce47..f05ce67 100644
--- a/test/test-productfilter.c
+++ b/test/test-productfilter.c
@@ -243,7 +243,9 @@ int main(void)
     Suite *s = productfilter_suite ();
     SRunner *sr = srunner_create (s);
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_entity_get_type();
diff --git a/test/test-treeuris.c b/test/test-treeuris.c
index 584cda8..07f14bf 100644
--- a/test/test-treeuris.c
+++ b/test/test-treeuris.c
@@ -134,7 +134,9 @@ int main(void)
     if (!getenv("LIBOSINFO_NETWORK_TESTS"))
         return 77; /* Skip */
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     /* Upfront so we don't confuse valgrind */
     osinfo_entity_get_type();
diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
index a4e025b..20a77c2 100644
--- a/tools/osinfo-db-validate.c
+++ b/tools/osinfo-db-validate.c
@@ -256,7 +256,9 @@ gint main(gint argc, gchar **argv)
     bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     context = g_option_context_new(_("- Validate XML documents "));
 
diff --git a/tools/osinfo-detect.c b/tools/osinfo-detect.c
index 0caa4ca..1262783 100644
--- a/tools/osinfo-detect.c
+++ b/tools/osinfo-detect.c
@@ -212,7 +212,9 @@ gint main(gint argc, gchar **argv)
         goto EXIT;
     }
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     loader = osinfo_loader_new();
     osinfo_loader_process_default_path(loader, &error);
diff --git a/tools/osinfo-install-script.c b/tools/osinfo-install-script.c
index 7cdb842..fabce96 100644
--- a/tools/osinfo-install-script.c
+++ b/tools/osinfo-install-script.c
@@ -254,7 +254,9 @@ gint main(gint argc, gchar **argv)
     bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     config = osinfo_install_config_new("http://libosinfo.fedorahosted.org/config");
 
diff --git a/tools/osinfo-query.c b/tools/osinfo-query.c
index 7a679b0..8ceba3f 100644
--- a/tools/osinfo-query.c
+++ b/tools/osinfo-query.c
@@ -366,7 +366,9 @@ gint main(gint argc, gchar **argv)
     bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
+#if !GLIB_CHECK_VERSION(2,35,1)
     g_type_init();
+#endif
 
     struct OsinfoType types[] = {
         { "os",
-- 
1.8.1.rc1.17.g75ed918

More information about the Libosinfo mailing list