Remove now-unnecessary g_type_init() calls

diff --git a/proxy/libproxy/glibpacrunner.c b/proxy/libproxy/glibpacrunner.c
index 1e97444..0e2cda5 100644 (file)
--- a/proxy/libproxy/glibpacrunner.c
+++ b/proxy/libproxy/glibpacrunner.c
@@ -130,8 +130,6 @@ main (int argc, char *argv[])
 {
   int owner_id;
 
-  g_type_init ();
-
   /* Unset variables that would make libproxy try to use gconf or ksettings */
   g_unsetenv ("GNOME_DESKTOP_SESSION_ID");
   g_unsetenv ("DESKTOP_SESSION");

diff --git a/proxy/tests/gnome.c b/proxy/tests/gnome.c
index 7c7b9b1..f57959f 100644 (file)
--- a/proxy/tests/gnome.c
+++ b/proxy/tests/gnome.c
@@ -144,7 +144,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/proxy/gnome/.libs", TRUE);

diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c
index 03488a3..408f3e2 100644 (file)
--- a/tls/tests/certificate.c
+++ b/tls/tests/certificate.c
@@ -412,7 +412,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);

diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index 751490d..fc2a486 100644 (file)
--- a/tls/tests/connection.c
+++ b/tls/tests/connection.c
@@ -826,7 +826,6 @@ main (int   argc,
 {
   int ret;
 
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);

diff --git a/tls/tests/file-database.c b/tls/tests/file-database.c
index c1c718a..5b6756f 100644 (file)
--- a/tls/tests/file-database.c
+++ b/tls/tests/file-database.c
@@ -507,7 +507,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);

diff --git a/tls/tests/pkcs11-array.c b/tls/tests/pkcs11-array.c
index ebb9e10..b5d5c3b 100644 (file)
--- a/tls/tests/pkcs11-array.c
+++ b/tls/tests/pkcs11-array.c
@@ -265,7 +265,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/pkcs11/array/add-find", TestArray, NULL,

diff --git a/tls/tests/pkcs11-pin.c b/tls/tests/pkcs11-pin.c
index 442b3dd..e08eff8 100644 (file)
--- a/tls/tests/pkcs11-pin.c
+++ b/tls/tests/pkcs11-pin.c
@@ -133,7 +133,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/pkcs11/pin/attributes", TestPin, NULL,

diff --git a/tls/tests/pkcs11-slot.c b/tls/tests/pkcs11-slot.c
index c65f6c7..fec9838 100644 (file)
--- a/tls/tests/pkcs11-slot.c
+++ b/tls/tests/pkcs11-slot.c
@@ -489,7 +489,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add ("/pkcs11/slot/properties", TestSlot, NULL,

diff --git a/tls/tests/pkcs11-util.c b/tls/tests/pkcs11-util.c
index 0864141..c27d8c1 100644 (file)
--- a/tls/tests/pkcs11-util.c
+++ b/tls/tests/pkcs11-util.c
@@ -51,7 +51,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_type_init ();
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/pkcs11/util/propagate-error", test_propagate_error);