Fix for deprecations in glib 2.35.0

 * g_type_init() was deprecated

10 files changed, 20 insertions, 0 deletions

diff --git a/pkcs11/secret-store/gkm-secret-standalone.c b/pkcs11/secret-store/gkm-secret-standalone.c
index cfc3956f..cd3cf041 100644
--- a/pkcs11/secret-store/gkm-secret-standalone.c
+++ b/pkcs11/secret-store/gkm-secret-standalone.c
@@ -57,7 +57,9 @@ C_GetFunctionList (CK_FUNCTION_LIST_PTR_PTR list)
 	if (!list)
 		return CKR_ARGUMENTS_BAD;
 
+#if !GLIB_CHECK_VERSION(2,35,0)
 	g_type_init ();
+#endif
 
 	gkm_crypto_initialize ();
 
diff --git a/pkcs11/secret-store/tests/test-secret-binary.c b/pkcs11/secret-store/tests/test-secret-binary.c
index a18803cd..3af087d3 100644
--- a/pkcs11/secret-store/tests/test-secret-binary.c
+++ b/pkcs11/secret-store/tests/test-secret-binary.c
@@ -248,7 +248,9 @@ test_read_with_schema (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_test_add ("/secret-store/binary/read_encrypted", Test, NULL, setup, test_read_encrypted, teardown);
diff --git a/pkcs11/secret-store/tests/test-secret-collection.c b/pkcs11/secret-store/tests/test-secret-collection.c
index 203d8abe..c9cdebb3 100644
--- a/pkcs11/secret-store/tests/test-secret-collection.c
+++ b/pkcs11/secret-store/tests/test-secret-collection.c
@@ -570,7 +570,9 @@ test_token_item_remove (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 ("/secret-store/collection/is_locked", Test, NULL, setup, test_is_locked, teardown);
diff --git a/pkcs11/secret-store/tests/test-secret-data.c b/pkcs11/secret-store/tests/test-secret-data.c
index c1bf54bb..3ecf7889 100644
--- a/pkcs11/secret-store/tests/test-secret-data.c
+++ b/pkcs11/secret-store/tests/test-secret-data.c
@@ -228,7 +228,9 @@ test_get_set_master (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 ("/secret-store/data/new", test_new);
diff --git a/pkcs11/secret-store/tests/test-secret-fields.c b/pkcs11/secret-store/tests/test-secret-fields.c
index 50763d64..975b208f 100644
--- a/pkcs11/secret-store/tests/test-secret-fields.c
+++ b/pkcs11/secret-store/tests/test-secret-fields.c
@@ -476,7 +476,9 @@ test_match_wrong_hashed (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 ("/secret-store/fields/new", test_new);
diff --git a/pkcs11/secret-store/tests/test-secret-item.c b/pkcs11/secret-store/tests/test-secret-item.c
index 2198cf2e..808d78cf 100644
--- a/pkcs11/secret-store/tests/test-secret-item.c
+++ b/pkcs11/secret-store/tests/test-secret-item.c
@@ -456,7 +456,9 @@ test_fields_attr_reverts (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 ("/secret-store/item/new", Test, NULL, setup, test_new, teardown);
diff --git a/pkcs11/secret-store/tests/test-secret-object.c b/pkcs11/secret-store/tests/test-secret-object.c
index db235cb2..be33ff56 100644
--- a/pkcs11/secret-store/tests/test-secret-object.c
+++ b/pkcs11/secret-store/tests/test-secret-object.c
@@ -281,7 +281,9 @@ test_locked_get_attr (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 ("/secret-store/object/is_locked", Test, NULL, setup, test_is_locked, teardown);
diff --git a/pkcs11/secret-store/tests/test-secret-schema.c b/pkcs11/secret-store/tests/test-secret-schema.c
index 22ef8c5c..68c2709d 100644
--- a/pkcs11/secret-store/tests/test-secret-schema.c
+++ b/pkcs11/secret-store/tests/test-secret-schema.c
@@ -220,7 +220,9 @@ test_match_unknown_xdg_schema_without_schema_locked (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_test_add ("/secret-store/schema/network-xdg-schema-without-schema-unlocked",
diff --git a/pkcs11/secret-store/tests/test-secret-search.c b/pkcs11/secret-store/tests/test-secret-search.c
index fc75996b..1df4c711 100644
--- a/pkcs11/secret-store/tests/test-secret-search.c
+++ b/pkcs11/secret-store/tests/test-secret-search.c
@@ -435,7 +435,9 @@ test_order (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_test_add ("/secret-store/search/new", Test, NULL, setup, test_new, teardown);
diff --git a/pkcs11/secret-store/tests/test-secret-textual.c b/pkcs11/secret-store/tests/test-secret-textual.c
index 87bc4082..b1f8ab33 100644
--- a/pkcs11/secret-store/tests/test-secret-textual.c
+++ b/pkcs11/secret-store/tests/test-secret-textual.c
@@ -214,7 +214,9 @@ test_read_with_schema (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_test_add ("/secret-store/search/read", Test, NULL, setup, test_read, teardown);