Update for deprecations

 * Remove old version checks for new stable dependencies
 * g_type_init() has been deprecated in glib 2.35.0

9 files changed, 18 insertions, 0 deletions

diff --git a/gck/tests/test-gck-attributes.c b/gck/tests/test-gck-attributes.c
index 04ae70e..7be1cb6 100644
--- a/gck/tests/test-gck-attributes.c
+++ b/gck/tests/test-gck-attributes.c
@@ -1276,7 +1276,9 @@ test_find_attributes (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 ("/gck/value/to_boolean", test_value_to_boolean);
diff --git a/gck/tests/test-gck-crypto.c b/gck/tests/test-gck-crypto.c
index d26ccf9..c70a765 100644
--- a/gck/tests/test-gck-crypto.c
+++ b/gck/tests/test-gck-crypto.c
@@ -646,7 +646,9 @@ null_log_handler (const gchar *log_domain, GLogLevelFlags log_level,
 int
 main (int argc, char **argv)
 {
+#if !GLIB_CHECK_VERSION(2,35,0)
 	g_type_init ();
+#endif
 	g_test_init (&argc, &argv, NULL);
 
 	g_set_prgname ("test-gck-crypto");
diff --git a/gck/tests/test-gck-enumerator.c b/gck/tests/test-gck-enumerator.c
index 2d5df63..bbbea5f 100644
--- a/gck/tests/test-gck-enumerator.c
+++ b/gck/tests/test-gck-enumerator.c
@@ -601,7 +601,9 @@ test_chained (Test *test,
 int
 main (int argc, char **argv)
 {
+#if !GLIB_CHECK_VERSION(2,35,0)
 	g_type_init ();
+#endif
 	g_test_init (&argc, &argv, NULL);
 
 	g_set_prgname ("test-gck-enumerator");
diff --git a/gck/tests/test-gck-module.c b/gck/tests/test-gck-module.c
index 2a1d3a1..99d2d61 100644
--- a/gck/tests/test-gck-module.c
+++ b/gck/tests/test-gck-module.c
@@ -164,7 +164,9 @@ test_module_info (Test *test, gconstpointer unused)
 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 ("/gck/module/initialize_async", test_initialize_async);
diff --git a/gck/tests/test-gck-modules.c b/gck/tests/test-gck-modules.c
index e212d1c..80cdb95 100644
--- a/gck/tests/test-gck-modules.c
+++ b/gck/tests/test-gck-modules.c
@@ -191,7 +191,9 @@ test_enumerate_uri (Test *test, gconstpointer unused)
 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 ("/gck/modules/enumerate_objects", Test, NULL, setup, test_enumerate_objects, teardown);
diff --git a/gck/tests/test-gck-object.c b/gck/tests/test-gck-object.c
index e0cdfd3..9cd316d 100644
--- a/gck/tests/test-gck-object.c
+++ b/gck/tests/test-gck-object.c
@@ -398,7 +398,9 @@ test_find_objects (Test *test, gconstpointer unused)
 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 ("/gck/object/object_props", Test, NULL, setup, test_object_props, teardown);
diff --git a/gck/tests/test-gck-session.c b/gck/tests/test-gck-session.c
index 438a361..f23a832 100644
--- a/gck/tests/test-gck-session.c
+++ b/gck/tests/test-gck-session.c
@@ -497,7 +497,9 @@ test_auto_login (Test *test, gconstpointer unused)
 int
 main (int argc, char **argv)
 {
+#if !GLIB_CHECK_VERSION(2,35,0)
 	g_type_init ();
+#endif
 	g_test_init (&argc, &argv, NULL);
 
 	g_set_prgname ("test-gck-session");
diff --git a/gck/tests/test-gck-slot.c b/gck/tests/test-gck-slot.c
index 3048026..a8f66db 100644
--- a/gck/tests/test-gck-slot.c
+++ b/gck/tests/test-gck-slot.c
@@ -242,7 +242,9 @@ test_token_info_match_different (Test *test, gconstpointer unused)
 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 ("/gck/slot/slot_info", Test, NULL, setup, test_slot_info, teardown);
diff --git a/gck/tests/test-gck-uri.c b/gck/tests/test-gck-uri.c
index 8c733d3..db44442 100644
--- a/gck/tests/test-gck-uri.c
+++ b/gck/tests/test-gck-uri.c
@@ -525,7 +525,9 @@ null_log_handler (const gchar *log_domain, GLogLevelFlags log_level,
 int
 main (int argc, char **argv)
 {
+#if !GLIB_CHECK_VERSION(2,35,0)
 	g_type_init ();
+#endif
 	g_test_init (&argc, &argv, NULL);
 
 	/* Suppress these messages in tests */