summaryrefslogtreecommitdiff
path: root/gio
diff options
context:
space:
mode:
Diffstat (limited to 'gio')
-rw-r--r--gio/gapplication.c4
-rw-r--r--gio/gdbus-tool.c2
-rw-r--r--gio/gdbusaddress.c2
-rw-r--r--gio/gio-querymodules.c2
-rw-r--r--gio/glib-compile-resources.c2
-rw-r--r--gio/gresource-tool.c2
-rw-r--r--gio/gsettings-tool.c2
-rw-r--r--gio/tests/actions.c1
-rw-r--r--gio/tests/appinfo.c1
-rw-r--r--gio/tests/async-close-output-stream.c2
-rw-r--r--gio/tests/buffered-input-stream.c1
-rw-r--r--gio/tests/buffered-output-stream.c2
-rw-r--r--gio/tests/cancellable.c1
-rw-r--r--gio/tests/contenttype.c2
-rw-r--r--gio/tests/contexts.c1
-rw-r--r--gio/tests/converter-stream.c1
-rw-r--r--gio/tests/data-input-stream.c1
-rw-r--r--gio/tests/data-output-stream.c1
-rw-r--r--gio/tests/desktop-app-info.c1
-rw-r--r--gio/tests/echo-server.c2
-rw-r--r--gio/tests/file.c2
-rw-r--r--gio/tests/fileattributematcher.c2
-rw-r--r--gio/tests/filter-cat.c2
-rw-r--r--gio/tests/filter-streams.c1
-rw-r--r--gio/tests/g-file-info.c1
-rw-r--r--gio/tests/g-file.c1
-rw-r--r--gio/tests/g-icon.c1
-rw-r--r--gio/tests/gapplication-example-cmdline2.c2
-rw-r--r--gio/tests/gapplication-example-dbushooks.c2
-rw-r--r--gio/tests/gapplication.c2
-rw-r--r--gio/tests/gdbus-addresses.c1
-rw-r--r--gio/tests/gdbus-auth.c1
-rw-r--r--gio/tests/gdbus-bz627724.c1
-rw-r--r--gio/tests/gdbus-close-pending.c1
-rw-r--r--gio/tests/gdbus-connection-flush-helper.c2
-rw-r--r--gio/tests/gdbus-connection-flush.c1
-rw-r--r--gio/tests/gdbus-connection-loss.c1
-rw-r--r--gio/tests/gdbus-connection-slow.c1
-rw-r--r--gio/tests/gdbus-connection.c1
-rw-r--r--gio/tests/gdbus-daemon.c2
-rw-r--r--gio/tests/gdbus-error.c1
-rw-r--r--gio/tests/gdbus-example-export.c2
-rw-r--r--gio/tests/gdbus-example-objectmanager-client.c2
-rw-r--r--gio/tests/gdbus-example-objectmanager-server.c2
-rw-r--r--gio/tests/gdbus-example-own-name.c2
-rw-r--r--gio/tests/gdbus-example-peer.c2
-rw-r--r--gio/tests/gdbus-example-server.c2
-rw-r--r--gio/tests/gdbus-example-subtree.c2
-rw-r--r--gio/tests/gdbus-example-unix-fd-client.c2
-rw-r--r--gio/tests/gdbus-example-watch-name.c2
-rw-r--r--gio/tests/gdbus-example-watch-proxy.c2
-rw-r--r--gio/tests/gdbus-exit-on-close.c1
-rw-r--r--gio/tests/gdbus-export.c1
-rw-r--r--gio/tests/gdbus-introspection.c1
-rw-r--r--gio/tests/gdbus-message.c1
-rw-r--r--gio/tests/gdbus-names.c1
-rw-r--r--gio/tests/gdbus-non-socket.c1
-rw-r--r--gio/tests/gdbus-peer.c1
-rw-r--r--gio/tests/gdbus-proxy-threads.c1
-rw-r--r--gio/tests/gdbus-proxy-well-known-name.c1
-rw-r--r--gio/tests/gdbus-proxy.c1
-rw-r--r--gio/tests/gdbus-serialization.c1
-rw-r--r--gio/tests/gdbus-test-codegen.c1
-rw-r--r--gio/tests/gdbus-threading.c1
-rw-r--r--gio/tests/gmenumodel.c1
-rw-r--r--gio/tests/gschema-compile.c1
-rw-r--r--gio/tests/gsettings.c1
-rw-r--r--gio/tests/httpd.c2
-rw-r--r--gio/tests/inet-address.c1
-rw-r--r--gio/tests/io-stream.c1
-rw-r--r--gio/tests/live-g-file.c1
-rw-r--r--gio/tests/memory-input-stream.c1
-rw-r--r--gio/tests/memory-output-stream.c1
-rw-r--r--gio/tests/mimeapps.c1
-rw-r--r--gio/tests/network-address.c2
-rw-r--r--gio/tests/network-monitor.c2
-rw-r--r--gio/tests/permission.c1
-rw-r--r--gio/tests/pollable.c1
-rw-r--r--gio/tests/proxy-test.c1
-rw-r--r--gio/tests/proxy.c2
-rw-r--r--gio/tests/readwrite.c1
-rw-r--r--gio/tests/resolver.c2
-rw-r--r--gio/tests/resources.c1
-rw-r--r--gio/tests/send-data.c2
-rw-r--r--gio/tests/simple-async-result.c1
-rw-r--r--gio/tests/sleepy-stream.c1
-rw-r--r--gio/tests/socket-client.c2
-rw-r--r--gio/tests/socket-server.c2
-rw-r--r--gio/tests/socket.c1
-rw-r--r--gio/tests/srvtarget.c1
-rw-r--r--gio/tests/task.c1
-rw-r--r--gio/tests/tls-certificate.c1
-rw-r--r--gio/tests/tls-interaction.c1
-rw-r--r--gio/tests/unix-fd.c2
-rw-r--r--gio/tests/unix-streams.c1
-rw-r--r--gio/tests/vfs.c1
-rw-r--r--gio/tests/volumemonitor.c2
-rw-r--r--gio/tests/win32-streams.c1
98 files changed, 0 insertions, 139 deletions
diff --git a/gio/gapplication.c b/gio/gapplication.c
index cb6ad7647..91d7b4f14 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -959,8 +959,6 @@ g_application_id_is_valid (const gchar *application_id)
*
* Creates a new #GApplication instance.
*
- * This function calls g_type_init() for you.
- *
* If non-%NULL, the application id must be valid. See
* g_application_id_is_valid().
*
@@ -975,8 +973,6 @@ g_application_new (const gchar *application_id,
{
g_return_val_if_fail (application_id == NULL || g_application_id_is_valid (application_id), NULL);
- g_type_init ();
-
return g_object_new (G_TYPE_APPLICATION,
"application-id", application_id,
"flags", flags,
diff --git a/gio/gdbus-tool.c b/gio/gdbus-tool.c
index a684c7a4b..6c4f3b180 100644
--- a/gio/gdbus-tool.c
+++ b/gio/gdbus-tool.c
@@ -1948,8 +1948,6 @@ main (gint argc, gchar *argv[])
completion_cur = NULL;
completion_prev = NULL;
- g_type_init ();
-
if (argc < 2)
{
usage (&argc, &argv, FALSE);
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index 9ea1e75b6..f8b2c72b2 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -1333,8 +1333,6 @@ g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow
if (g_getenv ("GDBUS_DAEMON_DEBUG") != NULL)
open_console_window ();
- g_type_init ();
-
loop = g_main_loop_new (NULL, FALSE);
address = "nonce-tcp:";
diff --git a/gio/gio-querymodules.c b/gio/gio-querymodules.c
index 0ebc85089..f445831c6 100644
--- a/gio/gio-querymodules.c
+++ b/gio/gio-querymodules.c
@@ -129,8 +129,6 @@ main (gint argc,
{
int i;
- g_type_init ();
-
if (argc == 1)
{
g_print ("Usage: gio-querymodules <directory1> [<directory2> ...]\n");
diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c
index ff97c6767..f8ac65209 100644
--- a/gio/glib-compile-resources.c
+++ b/gio/glib-compile-resources.c
@@ -641,8 +641,6 @@ main (int argc, char **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
- g_type_init ();
-
context = g_option_context_new (N_("FILE"));
g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
g_option_context_set_summary (context,
diff --git a/gio/gresource-tool.c b/gio/gresource-tool.c
index 70c9ee656..b38e407c0 100644
--- a/gio/gresource-tool.c
+++ b/gio/gresource-tool.c
@@ -602,8 +602,6 @@ main (int argc, char *argv[])
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
- g_type_init ();
-
if (argc < 2)
return cmd_help (FALSE, NULL);
diff --git a/gio/gsettings-tool.c b/gio/gsettings-tool.c
index bcf39881e..764c3d7d5 100644
--- a/gio/gsettings-tool.c
+++ b/gio/gsettings-tool.c
@@ -772,8 +772,6 @@ main (int argc, char **argv)
else
return gsettings_help (FALSE, argv[1]);
- g_type_init ();
-
if (argc > 2)
{
gchar **parts;
diff --git a/gio/tests/actions.c b/gio/tests/actions.c
index e808bef4e..74bcd9ae6 100644
--- a/gio/tests/actions.c
+++ b/gio/tests/actions.c
@@ -833,7 +833,6 @@ test_bug679509 (void)
int
main (int argc, char **argv)
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/actions/basic", test_basic);
diff --git a/gio/tests/appinfo.c b/gio/tests/appinfo.c
index 3cbd0f14f..91512527a 100644
--- a/gio/tests/appinfo.c
+++ b/gio/tests/appinfo.c
@@ -379,7 +379,6 @@ test_from_keyfile (void)
int
main (int argc, char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/appinfo/basic", test_basic);
diff --git a/gio/tests/async-close-output-stream.c b/gio/tests/async-close-output-stream.c
index 53018a7f9..507214c7a 100644
--- a/gio/tests/async-close-output-stream.c
+++ b/gio/tests/async-close-output-stream.c
@@ -247,8 +247,6 @@ main (int argc,
{
SetupData *data;
- g_type_init ();
-
g_test_init (&argc, &argv, NULL);
g_test_bug_base ("http://bugzilla.gnome.org/");
diff --git a/gio/tests/buffered-input-stream.c b/gio/tests/buffered-input-stream.c
index 82604db27..c94ca1064 100644
--- a/gio/tests/buffered-input-stream.c
+++ b/gio/tests/buffered-input-stream.c
@@ -372,7 +372,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_bug_base ("http://bugzilla.gnome.org/");
diff --git a/gio/tests/buffered-output-stream.c b/gio/tests/buffered-output-stream.c
index d20f319ef..c510a126f 100644
--- a/gio/tests/buffered-output-stream.c
+++ b/gio/tests/buffered-output-stream.c
@@ -307,8 +307,6 @@ test_truncate(void)
int
main (int argc, char *argv[])
{
- g_type_init ();
-
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/buffered-output-stream/write", test_write);
diff --git a/gio/tests/cancellable.c b/gio/tests/cancellable.c
index bd2958bc4..deadb3872 100644
--- a/gio/tests/cancellable.c
+++ b/gio/tests/cancellable.c
@@ -221,7 +221,6 @@ test_cancel_multiple_concurrent (void)
int
main (int argc, char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/cancellable/multiple-concurrent", test_cancel_multiple_concurrent);
diff --git a/gio/tests/contenttype.c b/gio/tests/contenttype.c
index c44bcc2be..ec46be400 100644
--- a/gio/tests/contenttype.c
+++ b/gio/tests/contenttype.c
@@ -203,8 +203,6 @@ test_icon (void)
int
main (int argc, char *argv[])
{
- g_type_init ();
-
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/contenttype/guess", test_guess);
diff --git a/gio/tests/contexts.c b/gio/tests/contexts.c
index fd5cd1a69..14175b447 100644
--- a/gio/tests/contexts.c
+++ b/gio/tests/contexts.c
@@ -185,7 +185,6 @@ main (int argc, char **argv)
GError *error = NULL;
int ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_file_get_contents (TEST_FILE, &test_file_buffer,
diff --git a/gio/tests/converter-stream.c b/gio/tests/converter-stream.c
index fc9c89692..c3d210611 100644
--- a/gio/tests/converter-stream.c
+++ b/gio/tests/converter-stream.c
@@ -1172,7 +1172,6 @@ main (int argc,
gint i;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_bug_base ("http://bugzilla.gnome.org/");
diff --git a/gio/tests/data-input-stream.c b/gio/tests/data-input-stream.c
index 2dddb56e4..58a3b3ac2 100644
--- a/gio/tests/data-input-stream.c
+++ b/gio/tests/data-input-stream.c
@@ -485,7 +485,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/data-input-stream/basic", test_basic);
diff --git a/gio/tests/data-output-stream.c b/gio/tests/data-output-stream.c
index f2ffd2396..2ea0cb795 100644
--- a/gio/tests/data-output-stream.c
+++ b/gio/tests/data-output-stream.c
@@ -494,7 +494,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/data-output-stream/basic", test_basic);
diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c
index 787d21725..1c2cc025b 100644
--- a/gio/tests/desktop-app-info.c
+++ b/gio/tests/desktop-app-info.c
@@ -356,7 +356,6 @@ main (int argc,
{
gint result;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
basedir = g_get_current_dir ();
diff --git a/gio/tests/echo-server.c b/gio/tests/echo-server.c
index c0a19972f..7634b5bb0 100644
--- a/gio/tests/echo-server.c
+++ b/gio/tests/echo-server.c
@@ -42,8 +42,6 @@ main (int argc, char *argv[])
GOptionContext *context;
GError *error = NULL;
- g_type_init ();
-
context = g_option_context_new (" - Test GSocket server stuff");
g_option_context_add_main_entries (context, cmd_entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error))
diff --git a/gio/tests/file.c b/gio/tests/file.c
index f19b87dc0..e2d17d4b8 100644
--- a/gio/tests/file.c
+++ b/gio/tests/file.c
@@ -653,8 +653,6 @@ test_async_delete (void)
int
main (int argc, char *argv[])
{
- g_type_init ();
-
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/file/basic", test_basic);
diff --git a/gio/tests/fileattributematcher.c b/gio/tests/fileattributematcher.c
index 3fa1b7657..95b78ec72 100644
--- a/gio/tests/fileattributematcher.c
+++ b/gio/tests/fileattributematcher.c
@@ -166,8 +166,6 @@ test_subtract (void)
int
main (int argc, char *argv[])
{
- g_type_init ();
-
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/fileattributematcher/exact", test_exact);
diff --git a/gio/tests/filter-cat.c b/gio/tests/filter-cat.c
index ff7ddd3c7..a36746108 100644
--- a/gio/tests/filter-cat.c
+++ b/gio/tests/filter-cat.c
@@ -215,8 +215,6 @@ main (int argc, char *argv[])
GFile *file;
int i;
- g_type_init ();
-
context =
g_option_context_new ("LOCATION... - concatenate LOCATIONS "
"to standard output.");
diff --git a/gio/tests/filter-streams.c b/gio/tests/filter-streams.c
index 6877a2120..7a700c426 100644
--- a/gio/tests/filter-streams.c
+++ b/gio/tests/filter-streams.c
@@ -249,7 +249,6 @@ main (int argc, char **argv)
g_test_init (&argc, &argv, NULL);
g_test_bug_base ("http://bugzilla.gnome.org/");
- g_type_init ();
g_test_add_func ("/filter-stream/input", test_input_filter);
g_test_add_func ("/filter-stream/output", test_output_filter);
#if 0
diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c
index ec0ae27d5..85fc9f37c 100644
--- a/gio/tests/g-file-info.c
+++ b/gio/tests/g-file-info.c
@@ -118,7 +118,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/g-file-info/test_g_file_info", test_g_file_info);
diff --git a/gio/tests/g-file.c b/gio/tests/g-file.c
index 8f0a18b61..9e3a6331a 100644
--- a/gio/tests/g-file.c
+++ b/gio/tests/g-file.c
@@ -506,7 +506,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
diff --git a/gio/tests/g-icon.c b/gio/tests/g-icon.c
index e38ee3409..84311355f 100644
--- a/gio/tests/g-icon.c
+++ b/gio/tests/g-icon.c
@@ -371,7 +371,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/icons/serialize", test_g_icon_serialize);
diff --git a/gio/tests/gapplication-example-cmdline2.c b/gio/tests/gapplication-example-cmdline2.c
index 9e6d89677..dc25e9540 100644
--- a/gio/tests/gapplication-example-cmdline2.c
+++ b/gio/tests/gapplication-example-cmdline2.c
@@ -82,8 +82,6 @@ test_application_new (const gchar *application_id,
{
g_return_val_if_fail (g_application_id_is_valid (application_id), NULL);
- g_type_init ();
-
return g_object_new (test_application_get_type (),
"application-id", application_id,
"flags", flags,
diff --git a/gio/tests/gapplication-example-dbushooks.c b/gio/tests/gapplication-example-dbushooks.c
index ab33f460e..e93cf0848 100644
--- a/gio/tests/gapplication-example-dbushooks.c
+++ b/gio/tests/gapplication-example-dbushooks.c
@@ -73,8 +73,6 @@ test_application_new (const gchar *application_id,
{
g_return_val_if_fail (g_application_id_is_valid (application_id), NULL);
- g_type_init ();
-
return g_object_new (test_application_get_type (),
"application-id", application_id,
"flags", flags,
diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c
index 2e0ea9d01..044bb3714 100644
--- a/gio/tests/gapplication.c
+++ b/gio/tests/gapplication.c
@@ -451,8 +451,6 @@ test_actions (void)
int
main (int argc, char **argv)
{
- g_type_init ();
-
g_test_init (&argc, &argv, NULL);
g_test_dbus_unset ();
diff --git a/gio/tests/gdbus-addresses.c b/gio/tests/gdbus-addresses.c
index 9ead2eccb..72388c5aa 100644
--- a/gio/tests/gdbus-addresses.c
+++ b/gio/tests/gdbus-addresses.c
@@ -106,7 +106,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/gdbus/empty-address", test_empty_address);
diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c
index 737770e8d..cafa13f5c 100644
--- a/gio/tests/gdbus-auth.c
+++ b/gio/tests/gdbus-auth.c
@@ -266,7 +266,6 @@ main (int argc,
setlocale (LC_ALL, "C");
- g_type_init ();
g_test_init (&argc, &argv, NULL);
session_bus_up ();
diff --git a/gio/tests/gdbus-bz627724.c b/gio/tests/gdbus-bz627724.c
index b9ea9c97f..d3d8cacbd 100644
--- a/gio/tests/gdbus-bz627724.c
+++ b/gio/tests/gdbus-bz627724.c
@@ -80,7 +80,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_dbus_unset ();
diff --git a/gio/tests/gdbus-close-pending.c b/gio/tests/gdbus-close-pending.c
index 287e7784f..a707e085a 100644
--- a/gio/tests/gdbus-close-pending.c
+++ b/gio/tests/gdbus-close-pending.c
@@ -384,7 +384,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add ("/gdbus/close-pending", Fixture, "close",
diff --git a/gio/tests/gdbus-connection-flush-helper.c b/gio/tests/gdbus-connection-flush-helper.c
index 5e3607578..dd9f4a7dd 100644
--- a/gio/tests/gdbus-connection-flush-helper.c
+++ b/gio/tests/gdbus-connection-flush-helper.c
@@ -30,8 +30,6 @@ main (int argc,
GError *error;
gboolean ret;
- g_type_init ();
-
error = NULL;
c = g_bus_get_sync (G_BUS_TYPE_SESSION,
NULL, /* GCancellable* */
diff --git a/gio/tests/gdbus-connection-flush.c b/gio/tests/gdbus-connection-flush.c
index 9b8dccf5b..b331e4b14 100644
--- a/gio/tests/gdbus-connection-flush.c
+++ b/gio/tests/gdbus-connection-flush.c
@@ -370,7 +370,6 @@ main (int argc,
{
gint ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add ("/gdbus/connection/flush/busy", Fixture, NULL,
diff --git a/gio/tests/gdbus-connection-loss.c b/gio/tests/gdbus-connection-loss.c
index 504383e9e..addc2a3bf 100644
--- a/gio/tests/gdbus-connection-loss.c
+++ b/gio/tests/gdbus-connection-loss.c
@@ -113,7 +113,6 @@ main (int argc,
GError *error;
gint ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
/* all the tests rely on a shared main loop */
diff --git a/gio/tests/gdbus-connection-slow.c b/gio/tests/gdbus-connection-slow.c
index b3c40f9eb..b372df3bb 100644
--- a/gio/tests/gdbus-connection-slow.c
+++ b/gio/tests/gdbus-connection-slow.c
@@ -194,7 +194,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
/* all the tests rely on a shared main loop */
diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c
index f4ba37d6a..baa062b07 100644
--- a/gio/tests/gdbus-connection.c
+++ b/gio/tests/gdbus-connection.c
@@ -1142,7 +1142,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
/* all the tests rely on a shared main loop */
diff --git a/gio/tests/gdbus-daemon.c b/gio/tests/gdbus-daemon.c
index 04717082c..a33269916 100644
--- a/gio/tests/gdbus-daemon.c
+++ b/gio/tests/gdbus-daemon.c
@@ -22,8 +22,6 @@ main (int argc, char *argv[])
{ NULL }
};
- g_type_init ();
-
context = g_option_context_new ("");
g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
g_option_context_set_summary (context,
diff --git a/gio/tests/gdbus-error.c b/gio/tests/gdbus-error.c
index 00dfc6107..96f3a76d8 100644
--- a/gio/tests/gdbus-error.c
+++ b/gio/tests/gdbus-error.c
@@ -257,7 +257,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/gdbus/registered-errors", test_registered_errors);
diff --git a/gio/tests/gdbus-example-export.c b/gio/tests/gdbus-example-export.c
index 51af05195..341ce60d3 100644
--- a/gio/tests/gdbus-example-export.c
+++ b/gio/tests/gdbus-example-export.c
@@ -303,8 +303,6 @@ main (int argc, char *argv[])
GMainLoop *loop;
MyObject *myobj;
- g_type_init ();
-
/* We are lazy here - we don't want to manually provide
* the introspection data structures - so we just build
* them from XML.
diff --git a/gio/tests/gdbus-example-objectmanager-client.c b/gio/tests/gdbus-example-objectmanager-client.c
index 3d9242d7e..a99399665 100644
--- a/gio/tests/gdbus-example-objectmanager-client.c
+++ b/gio/tests/gdbus-example-objectmanager-client.c
@@ -117,8 +117,6 @@ main (gint argc, gchar *argv[])
manager = NULL;
loop = NULL;
- g_type_init ();
-
loop = g_main_loop_new (NULL, FALSE);
error = NULL;
diff --git a/gio/tests/gdbus-example-objectmanager-server.c b/gio/tests/gdbus-example-objectmanager-server.c
index 367b4f455..1233958b7 100644
--- a/gio/tests/gdbus-example-objectmanager-server.c
+++ b/gio/tests/gdbus-example-objectmanager-server.c
@@ -139,8 +139,6 @@ main (gint argc, gchar *argv[])
GMainLoop *loop;
guint id;
- g_type_init ();
-
loop = g_main_loop_new (NULL, FALSE);
id = g_bus_own_name (G_BUS_TYPE_SESSION,
diff --git a/gio/tests/gdbus-example-own-name.c b/gio/tests/gdbus-example-own-name.c
index 0466cd4c6..74d39208f 100644
--- a/gio/tests/gdbus-example-own-name.c
+++ b/gio/tests/gdbus-example-own-name.c
@@ -43,8 +43,6 @@ main (int argc, char *argv[])
{ NULL}
};
- g_type_init ();
-
error = NULL;
opt_name = NULL;
opt_replace = FALSE;
diff --git a/gio/tests/gdbus-example-peer.c b/gio/tests/gdbus-example-peer.c
index cb54a132e..b954f7426 100644
--- a/gio/tests/gdbus-example-peer.c
+++ b/gio/tests/gdbus-example-peer.c
@@ -177,8 +177,6 @@ main (int argc, char *argv[])
ret = 1;
- g_type_init ();
-
opt_address = NULL;
opt_server = FALSE;
opt_allow_anonymous = FALSE;
diff --git a/gio/tests/gdbus-example-server.c b/gio/tests/gdbus-example-server.c
index 79f83df06..6f1123d85 100644
--- a/gio/tests/gdbus-example-server.c
+++ b/gio/tests/gdbus-example-server.c
@@ -363,8 +363,6 @@ main (int argc, char *argv[])
guint owner_id;
GMainLoop *loop;
- g_type_init ();
-
/* We are lazy here - we don't want to manually provide
* the introspection data structures - so we just build
* them from XML.
diff --git a/gio/tests/gdbus-example-subtree.c b/gio/tests/gdbus-example-subtree.c
index cd3365f70..e92107075 100644
--- a/gio/tests/gdbus-example-subtree.c
+++ b/gio/tests/gdbus-example-subtree.c
@@ -364,8 +364,6 @@ main (int argc, char *argv[])
guint owner_id;
GMainLoop *loop;
- g_type_init ();
-
/* We are lazy here - we don't want to manually provide
* the introspection data structures - so we just build
* them from XML.
diff --git a/gio/tests/gdbus-example-unix-fd-client.c b/gio/tests/gdbus-example-unix-fd-client.c
index 9b9c27a6b..e3ab015bd 100644
--- a/gio/tests/gdbus-example-unix-fd-client.c
+++ b/gio/tests/gdbus-example-unix-fd-client.c
@@ -116,8 +116,6 @@ main (int argc, char *argv[])
guint watcher_id;
GMainLoop *loop;
- g_type_init ();
-
watcher_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
"org.gtk.GDBus.TestServer",
G_BUS_NAME_WATCHER_FLAGS_NONE,
diff --git a/gio/tests/gdbus-example-watch-name.c b/gio/tests/gdbus-example-watch-name.c
index 769419b22..caec6ec08 100644
--- a/gio/tests/gdbus-example-watch-name.c
+++ b/gio/tests/gdbus-example-watch-name.c
@@ -43,8 +43,6 @@ main (int argc, char *argv[])
GError *error;
GBusNameWatcherFlags flags;
- g_type_init ();
-
error = NULL;
opt_context = g_option_context_new ("g_bus_watch_name() example");
g_option_context_set_summary (opt_context,
diff --git a/gio/tests/gdbus-example-watch-proxy.c b/gio/tests/gdbus-example-watch-proxy.c
index c66826d86..51132e385 100644
--- a/gio/tests/gdbus-example-watch-proxy.c
+++ b/gio/tests/gdbus-example-watch-proxy.c
@@ -153,8 +153,6 @@ main (int argc, char *argv[])
GDBusProxyFlags flags;
GDBusProxy *proxy;
- g_type_init ();
-
loop = NULL;
proxy = NULL;
diff --git a/gio/tests/gdbus-exit-on-close.c b/gio/tests/gdbus-exit-on-close.c
index f97e5dac0..08338c492 100644
--- a/gio/tests/gdbus-exit-on-close.c
+++ b/gio/tests/gdbus-exit-on-close.c
@@ -203,7 +203,6 @@ main (int argc,
{
gint i;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
for (i = 0; cases[i].name != NULL; i++)
diff --git a/gio/tests/gdbus-export.c b/gio/tests/gdbus-export.c
index e015ed913..bc62bfd88 100644
--- a/gio/tests/gdbus-export.c
+++ b/gio/tests/gdbus-export.c
@@ -1531,7 +1531,6 @@ main (int argc,
{
gint ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
/* all the tests rely on a shared main loop */
diff --git a/gio/tests/gdbus-introspection.c b/gio/tests/gdbus-introspection.c
index 17a1870f6..2f66e49ac 100644
--- a/gio/tests/gdbus-introspection.c
+++ b/gio/tests/gdbus-introspection.c
@@ -303,7 +303,6 @@ main (int argc,
{
gint ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
/* all the tests rely on a shared main loop */
diff --git a/gio/tests/gdbus-message.c b/gio/tests/gdbus-message.c
index 13d5d0ddf..36ffc4110 100644
--- a/gio/tests/gdbus-message.c
+++ b/gio/tests/gdbus-message.c
@@ -149,7 +149,6 @@ main (int argc,
{
setlocale (LC_ALL, "C");
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/gdbus/message/lock", message_lock);
diff --git a/gio/tests/gdbus-names.c b/gio/tests/gdbus-names.c
index 246a261b8..b478c6f12 100644
--- a/gio/tests/gdbus-names.c
+++ b/gio/tests/gdbus-names.c
@@ -769,7 +769,6 @@ main (int argc,
{
gint ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
loop = g_main_loop_new (NULL, FALSE);
diff --git a/gio/tests/gdbus-non-socket.c b/gio/tests/gdbus-non-socket.c
index 238b30318..77c814d3b 100644
--- a/gio/tests/gdbus-non-socket.c
+++ b/gio/tests/gdbus-non-socket.c
@@ -291,7 +291,6 @@ main (int argc,
{
gint ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/gdbus/non-socket", test_non_socket);
diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c
index d25f9f64b..043559732 100644
--- a/gio/tests/gdbus-peer.c
+++ b/gio/tests/gdbus-peer.c
@@ -1801,7 +1801,6 @@ main (int argc,
GDBusNodeInfo *introspection_data = NULL;
gchar *tmpdir = NULL;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
introspection_data = g_dbus_node_info_new_for_xml (test_interface_introspection_xml, NULL);
diff --git a/gio/tests/gdbus-proxy-threads.c b/gio/tests/gdbus-proxy-threads.c
index 14131ee36..c74c05c5d 100644
--- a/gio/tests/gdbus-proxy-threads.c
+++ b/gio/tests/gdbus-proxy-threads.c
@@ -239,7 +239,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_dbus_unset ();
diff --git a/gio/tests/gdbus-proxy-well-known-name.c b/gio/tests/gdbus-proxy-well-known-name.c
index b2d204d17..1e8ea5e98 100644
--- a/gio/tests/gdbus-proxy-well-known-name.c
+++ b/gio/tests/gdbus-proxy-well-known-name.c
@@ -259,7 +259,6 @@ main (int argc,
{
gint ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
/* all the tests rely on a shared main loop */
diff --git a/gio/tests/gdbus-proxy.c b/gio/tests/gdbus-proxy.c
index 06bd8aa4e..e614ed3de 100644
--- a/gio/tests/gdbus-proxy.c
+++ b/gio/tests/gdbus-proxy.c
@@ -912,7 +912,6 @@ main (int argc,
gint ret;
GDBusNodeInfo *introspection_data = NULL;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
introspection_data = g_dbus_node_info_new_for_xml (frob_dbus_interface_xml, NULL);
diff --git a/gio/tests/gdbus-serialization.c b/gio/tests/gdbus-serialization.c
index 16b987344..e94fc4d90 100644
--- a/gio/tests/gdbus-serialization.c
+++ b/gio/tests/gdbus-serialization.c
@@ -1056,7 +1056,6 @@ main (int argc,
{
setlocale (LC_ALL, "C");
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_bug_base ("https://bugzilla.gnome.org/show_bug.cgi?id=");
diff --git a/gio/tests/gdbus-test-codegen.c b/gio/tests/gdbus-test-codegen.c
index 83965aaa6..8af2ca67d 100644
--- a/gio/tests/gdbus-test-codegen.c
+++ b/gio/tests/gdbus-test-codegen.c
@@ -2354,7 +2354,6 @@ main (int argc,
{
gint ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
session_bus_up ();
diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
index 728b70e88..5373cbe0f 100644
--- a/gio/tests/gdbus-threading.c
+++ b/gio/tests/gdbus-threading.c
@@ -582,7 +582,6 @@ main (int argc,
GError *error;
gint ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
session_bus_up ();
diff --git a/gio/tests/gmenumodel.c b/gio/tests/gmenumodel.c
index 82bc0cc8e..b5bdac2ac 100644
--- a/gio/tests/gmenumodel.c
+++ b/gio/tests/gmenumodel.c
@@ -1141,7 +1141,6 @@ main (int argc, char **argv)
gboolean ret;
g_test_init (&argc, &argv, NULL);
- g_type_init ();
session_bus_up ();
diff --git a/gio/tests/gschema-compile.c b/gio/tests/gschema-compile.c
index 38d4d3eaf..a5ce10aa0 100644
--- a/gio/tests/gschema-compile.c
+++ b/gio/tests/gschema-compile.c
@@ -131,7 +131,6 @@ main (int argc, char *argv[])
setlocale (LC_ALL, "");
- g_type_init ();
g_test_init (&argc, &argv, NULL);
for (i = 0; i < G_N_ELEMENTS (tests); ++i)
diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
index 9628badc5..515fad2d9 100644
--- a/gio/tests/gsettings.c
+++ b/gio/tests/gsettings.c
@@ -2141,7 +2141,6 @@ main (int argc, char *argv[])
if (!backend_set)
g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_remove ("org.gtk.test.enums.xml");
diff --git a/gio/tests/httpd.c b/gio/tests/httpd.c
index a2325d024..41bc6c8b8 100644
--- a/gio/tests/httpd.c
+++ b/gio/tests/httpd.c
@@ -146,8 +146,6 @@ main (int argc, char *argv[])
GOptionContext *context;
GError *error = NULL;
- g_type_init ();
-
context = g_option_context_new ("<http root dir> - Simple HTTP server");
g_option_context_add_main_entries (context, cmd_entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error))
diff --git a/gio/tests/inet-address.c b/gio/tests/inet-address.c
index 3a2fbbccb..566078bc4 100644
--- a/gio/tests/inet-address.c
+++ b/gio/tests/inet-address.c
@@ -347,7 +347,6 @@ test_mask_match (void)
int
main (int argc, char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/inet-address/parse", test_parse);
diff --git a/gio/tests/io-stream.c b/gio/tests/io-stream.c
index 0a20980d0..59b1c2669 100644
--- a/gio/tests/io-stream.c
+++ b/gio/tests/io-stream.c
@@ -177,7 +177,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/io-stream/copy-chunks", test_copy_chunks);
diff --git a/gio/tests/live-g-file.c b/gio/tests/live-g-file.c
index 32b600b78..c104a9cf8 100644
--- a/gio/tests/live-g-file.c
+++ b/gio/tests/live-g-file.c
@@ -1236,7 +1236,6 @@ main (int argc, char *argv[])
posix_compat = FALSE;
/* strip all gtester-specific args */
- g_type_init ();
g_test_init (&argc, &argv, NULL);
/* no extra parameters specified, assume we're executed from glib test suite */
diff --git a/gio/tests/memory-input-stream.c b/gio/tests/memory-input-stream.c
index d012125a3..98bb2f1f9 100644
--- a/gio/tests/memory-input-stream.c
+++ b/gio/tests/memory-input-stream.c
@@ -226,7 +226,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/memory-input-stream/read-chunks", test_read_chunks);
diff --git a/gio/tests/memory-output-stream.c b/gio/tests/memory-output-stream.c
index ddaa75fed..e9bfc3d05 100644
--- a/gio/tests/memory-output-stream.c
+++ b/gio/tests/memory-output-stream.c
@@ -216,7 +216,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_bug_base ("http://bugzilla.gnome.org/");
diff --git a/gio/tests/mimeapps.c b/gio/tests/mimeapps.c
index 5c99917d7..9bc22babb 100644
--- a/gio/tests/mimeapps.c
+++ b/gio/tests/mimeapps.c
@@ -580,7 +580,6 @@ test_scheme_handler (void)
int
main (int argc, char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
setup ();
diff --git a/gio/tests/network-address.c b/gio/tests/network-address.c
index 7d6a0da48..7a419c21d 100644
--- a/gio/tests/network-address.c
+++ b/gio/tests/network-address.c
@@ -111,8 +111,6 @@ main (int argc, char *argv[])
gint i;
gchar *path;
- g_type_init ();
-
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/network-address/basic", test_basic);
diff --git a/gio/tests/network-monitor.c b/gio/tests/network-monitor.c
index 7205da11b..618b5e00e 100644
--- a/gio/tests/network-monitor.c
+++ b/gio/tests/network-monitor.c
@@ -514,8 +514,6 @@ main (int argc, char **argv)
{
int ret;
- g_type_init ();
-
if (argc == 2 && !strcmp (argv[1], "--watch"))
{
do_watch_network ();
diff --git a/gio/tests/permission.c b/gio/tests/permission.c
index e011a4435..14094a0b5 100644
--- a/gio/tests/permission.c
+++ b/gio/tests/permission.c
@@ -109,7 +109,6 @@ test_simple (void)
int
main (int argc, char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/permission/simple", test_simple);
diff --git a/gio/tests/pollable.c b/gio/tests/pollable.c
index 8a27da835..0633e4a9d 100644
--- a/gio/tests/pollable.c
+++ b/gio/tests/pollable.c
@@ -274,7 +274,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
#ifdef G_OS_UNIX
diff --git a/gio/tests/proxy-test.c b/gio/tests/proxy-test.c
index 00e87df0c..842e7d9f2 100644
--- a/gio/tests/proxy-test.c
+++ b/gio/tests/proxy-test.c
@@ -1096,7 +1096,6 @@ main (int argc,
GCancellable *cancellable;
gint result;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
/* Register stuff. The dummy g_proxy_get_default_for_protocol() call
diff --git a/gio/tests/proxy.c b/gio/tests/proxy.c
index c05d7e909..57383006c 100644
--- a/gio/tests/proxy.c
+++ b/gio/tests/proxy.c
@@ -580,8 +580,6 @@ main (gint argc, gchar **argv)
gboolean cancel = FALSE;
ProxyTestType type = USE_RESOLVER;
- g_type_init ();
-
while (argc >= 2 && argv[1][0] == '-')
{
if (!strcmp (argv[1], "-s"))
diff --git a/gio/tests/readwrite.c b/gio/tests/readwrite.c
index 78362709e..0484d186a 100644
--- a/gio/tests/readwrite.c
+++ b/gio/tests/readwrite.c
@@ -284,7 +284,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/readwrite/test_g_file_open_readwrite",
diff --git a/gio/tests/resolver.c b/gio/tests/resolver.c
index 81a6df2e6..02aa0c83b 100644
--- a/gio/tests/resolver.c
+++ b/gio/tests/resolver.c
@@ -684,8 +684,6 @@ main (int argc, char **argv)
guint watch;
#endif
- g_type_init ();
-
context = g_option_context_new ("lookups ...");
g_option_context_add_main_entries (context, option_entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error))
diff --git a/gio/tests/resources.c b/gio/tests/resources.c
index e47d92f95..d21513b3c 100644
--- a/gio/tests/resources.c
+++ b/gio/tests/resources.c
@@ -630,7 +630,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
_g_test2_register_resource ();
diff --git a/gio/tests/send-data.c b/gio/tests/send-data.c
index 201e7102d..a30bdca56 100644
--- a/gio/tests/send-data.c
+++ b/gio/tests/send-data.c
@@ -90,8 +90,6 @@ main (int argc, char *argv[])
GError *error = NULL;
char buffer[1000];
- g_type_init ();
-
context = g_option_context_new (" <hostname>[:port] - send data to tcp host");
g_option_context_add_main_entries (context, cmd_entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error))
diff --git a/gio/tests/simple-async-result.c b/gio/tests/simple-async-result.c
index 8112057ae..e9b089eea 100644
--- a/gio/tests/simple-async-result.c
+++ b/gio/tests/simple-async-result.c
@@ -122,7 +122,6 @@ test_simple_async (void)
int
main (int argc, char **argv)
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/gio/simple-async-result/test", test_simple_async);
diff --git a/gio/tests/sleepy-stream.c b/gio/tests/sleepy-stream.c
index 6d9da7b9a..4d3ca1d27 100644
--- a/gio/tests/sleepy-stream.c
+++ b/gio/tests/sleepy-stream.c
@@ -285,7 +285,6 @@ main (int argc, char **argv)
g_test_init (&argc, &argv, NULL);
g_test_bug_base ("http://bugzilla.gnome.org/");
- g_type_init ();
g_test_add_func ("/filter-stream/input", test);
g_test_add_func ("/filter-stream/async", asynch);
diff --git a/gio/tests/socket-client.c b/gio/tests/socket-client.c
index ca06c0f61..62dda8991 100644
--- a/gio/tests/socket-client.c
+++ b/gio/tests/socket-client.c
@@ -261,8 +261,6 @@ main (int argc,
GTlsCertificate *certificate = NULL;
gint i;
- g_type_init ();
-
address = NULL;
connection = NULL;
diff --git a/gio/tests/socket-server.c b/gio/tests/socket-server.c
index b89edb5b9..decf3ecd1 100644
--- a/gio/tests/socket-server.c
+++ b/gio/tests/socket-server.c
@@ -63,8 +63,6 @@ main (int argc,
GInputStream *istream;
GOutputStream *ostream;
- g_type_init ();
-
context = g_option_context_new (" - Test GSocket server stuff");
g_option_context_add_main_entries (context, cmd_entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error))
diff --git a/gio/tests/socket.c b/gio/tests/socket.c
index 0a61c9f59..f14229623 100644
--- a/gio/tests/socket.c
+++ b/gio/tests/socket.c
@@ -817,7 +817,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/socket/ipv4_sync", test_ipv4_sync);
diff --git a/gio/tests/srvtarget.c b/gio/tests/srvtarget.c
index c7330f9ae..84f803ee7 100644
--- a/gio/tests/srvtarget.c
+++ b/gio/tests/srvtarget.c
@@ -149,7 +149,6 @@ test_srv_target_ordering (void)
int
main (int argc, char **argv)
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/srvtarget/srv-target-ordering", test_srv_target_ordering);
diff --git a/gio/tests/task.c b/gio/tests/task.c
index 7c7606f64..e728ff8d4 100644
--- a/gio/tests/task.c
+++ b/gio/tests/task.c
@@ -1632,7 +1632,6 @@ main (int argc, char **argv)
{
int ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
loop = g_main_loop_new (NULL, FALSE);
diff --git a/gio/tests/tls-certificate.c b/gio/tests/tls-certificate.c
index a1796daea..4db07b360 100644
--- a/gio/tests/tls-certificate.c
+++ b/gio/tests/tls-certificate.c
@@ -269,7 +269,6 @@ main (int argc,
Reference ref;
GError *error = NULL;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
_g_test_tls_backend_get_type ();
diff --git a/gio/tests/tls-interaction.c b/gio/tests/tls-interaction.c
index 3498d0cef..a34ff297f 100644
--- a/gio/tests/tls-interaction.c
+++ b/gio/tests/tls-interaction.c
@@ -606,7 +606,6 @@ main (int argc,
GPtrArray *fixtures;
gint ret;
- g_type_init ();
g_test_init (&argc, &argv, NULL);
fixtures = g_ptr_array_new_with_free_func (g_free);
diff --git a/gio/tests/unix-fd.c b/gio/tests/unix-fd.c
index 02a63cad3..fd922c5a4 100644
--- a/gio/tests/unix-fd.c
+++ b/gio/tests/unix-fd.c
@@ -235,8 +235,6 @@ main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
- g_type_init ();
-
g_test_add_func ("/unix-streams/file-descriptors", test_fds);
return g_test_run();
diff --git a/gio/tests/unix-streams.c b/gio/tests/unix-streams.c
index 59850789c..36eb3d6d7 100644
--- a/gio/tests/unix-streams.c
+++ b/gio/tests/unix-streams.c
@@ -299,7 +299,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/unix-streams/basic", test_basic);
diff --git a/gio/tests/vfs.c b/gio/tests/vfs.c
index 7a7f817f4..47ba3c0d5 100644
--- a/gio/tests/vfs.c
+++ b/gio/tests/vfs.c
@@ -46,7 +46,6 @@ test_local (void)
int
main (int argc, char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/gvfs/local", test_local);
diff --git a/gio/tests/volumemonitor.c b/gio/tests/volumemonitor.c
index 489150524..6b61c3070 100644
--- a/gio/tests/volumemonitor.c
+++ b/gio/tests/volumemonitor.c
@@ -164,8 +164,6 @@ main (int argc, char *argv[])
g_setenv ("GIO_USE_VFS", "local", FALSE);
- g_type_init ();
-
g_test_init (&argc, &argv, NULL);
monitor = g_volume_monitor_get ();
diff --git a/gio/tests/win32-streams.c b/gio/tests/win32-streams.c
index 99f853bd4..b7ff0b3d0 100644
--- a/gio/tests/win32-streams.c
+++ b/gio/tests/win32-streams.c
@@ -525,7 +525,6 @@ int
main (int argc,
char *argv[])
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/win32-streams/pipe-io-test", test_pipe_io);