tests: Remove g_type_init() calls

We depend on GLib 2.36.0, which deprecated g_type_init() since GType
initialisation is now done automatically.

Reviewed-by: Olivier Crête <olivier.crete@collabora.com>
Differential Revision: https://phabricator.freedesktop.org/D296

26 files changed, 0 insertions, 40 deletions

diff --git a/docs/design.txt b/docs/design.txt
index 4f43724..6a3bf12 100644
--- a/docs/design.txt
+++ b/docs/design.txt
@@ -90,7 +90,6 @@ NiceAgent GObject interface defined in 'nice/agent.h'.
 
 The rough order of control follow is as follows:
 
-- client should initialize glib with g_type_init()
 - creation of NiceAgent object instance
 - setting agent properties such as STUN and TURN server addresses
 - connecting the GObject signals with g_signal_connect() to application
diff --git a/examples/sdp-example.c b/examples/sdp-example.c
index 246341e..bb95440 100644
--- a/examples/sdp-example.c
+++ b/examples/sdp-example.c
@@ -95,11 +95,7 @@ main(int argc, char *argv[])
     g_debug("Using stun server '[%s]:%u'\n", stun_addr, stun_port);
   }
 
-#if GLIB_CHECK_VERSION(2, 36, 0)
   g_networking_init();
-#else
-  g_type_init();
-#endif
 
   gloop = g_main_loop_new(NULL, FALSE);
 
diff --git a/examples/simple-example.c b/examples/simple-example.c
index 6e13dc6..17702b1 100644
--- a/examples/simple-example.c
+++ b/examples/simple-example.c
@@ -105,11 +105,7 @@ main(int argc, char *argv[])
     g_debug("Using stun server '[%s]:%u'\n", stun_addr, stun_port);
   }
 
-#if GLIB_CHECK_VERSION(2, 36, 0)
   g_networking_init();
-#else
-  g_type_init();
-#endif
 
   gloop = g_main_loop_new(NULL, FALSE);
 #ifdef G_OS_WIN32
diff --git a/examples/threaded-example.c b/examples/threaded-example.c
index 79eda8d..d23d7f9 100644
--- a/examples/threaded-example.c
+++ b/examples/threaded-example.c
@@ -104,11 +104,6 @@ main(int argc, char *argv[])
     g_debug("Using stun server '[%s]:%u'\n", stun_addr, stun_port);
   }
 
-#if GLIB_CHECK_VERSION(2, 36, 0)
-  g_networking_init();
-#else
-  g_type_init();
-#endif
   g_networking_init();
 
   gloop = g_main_loop_new(NULL, FALSE);
diff --git a/tests/test-add-remove-stream.c b/tests/test-add-remove-stream.c
index 5ed3463..82d73bf 100644
--- a/tests/test-add-remove-stream.c
+++ b/tests/test-add-remove-stream.c
@@ -54,7 +54,6 @@ main (void)
   WSAStartup(0x0202, &w);
 #endif
   nice_address_init (&addr);
-  g_type_init ();
   g_thread_init (NULL);
 
   if (!nice_address_set_from_string (&addr, "127.0.0.1"))
diff --git a/tests/test-bsd.c b/tests/test-bsd.c
index 6b747d0..c1ddf53 100644
--- a/tests/test-bsd.c
+++ b/tests/test-bsd.c
@@ -368,8 +368,6 @@ test_multi_message_recv (guint n_sends, guint n_receives,
 int
 main (void)
 {
-  g_type_init ();
-
   test_socket_initial_properties ();
   test_socket_address_properties ();
   test_simple_send_recv ();
diff --git a/tests/test-build-io-stream.c b/tests/test-build-io-stream.c
index 0c9c593..e814f92 100644
--- a/tests/test-build-io-stream.c
+++ b/tests/test-build-io-stream.c
@@ -440,7 +440,6 @@ main (void)
   WSAStartup (0x0202, &w);
 #endif
   nice_address_init (&addr);
-  g_type_init ();
   g_thread_init (NULL);
 
   g_assert (nice_address_set_from_string (&addr, "127.0.0.1"));
diff --git a/tests/test-credentials.c b/tests/test-credentials.c
index f678afa..ebd3fec 100644
--- a/tests/test-credentials.c
+++ b/tests/test-credentials.c
@@ -172,7 +172,6 @@ int main (void)
   WSADATA w;
   WSAStartup(0x0202, &w);
 #endif
-  g_type_init ();
   g_thread_init (NULL);
 
   loop = g_main_loop_new (NULL, FALSE);
diff --git a/tests/test-dribble.c b/tests/test-dribble.c
index 6603129..2e8b73d 100644
--- a/tests/test-dribble.c
+++ b/tests/test-dribble.c
@@ -215,7 +215,6 @@ int main (void)
   WSAStartup(0x0202, &w);
 #endif
 
-  g_type_init ();
   g_thread_init (NULL);
 
   global_mainloop = g_main_loop_new (NULL, FALSE);
diff --git a/tests/test-fallback.c b/tests/test-fallback.c
index f97cb0d..191f3ca 100644
--- a/tests/test-fallback.c
+++ b/tests/test-fallback.c
@@ -491,7 +491,6 @@ int main (void)
 
   WSAStartup(0x0202, &w);
 #endif
-  g_type_init ();
   g_thread_init (NULL);
 
   global_mainloop = g_main_loop_new (NULL, FALSE);
diff --git a/tests/test-fullmode.c b/tests/test-fullmode.c
index 03778f7..43b54c3 100644
--- a/tests/test-fullmode.c
+++ b/tests/test-fullmode.c
@@ -834,7 +834,6 @@ int main (void)
 
   WSAStartup(0x0202, &w);
 #endif
-  g_type_init ();
   g_thread_init(NULL);
 
   global_mainloop = g_main_loop_new (NULL, FALSE);
diff --git a/tests/test-icetcp.c b/tests/test-icetcp.c
index 7ab3563..788719f 100644
--- a/tests/test-icetcp.c
+++ b/tests/test-icetcp.c
@@ -397,7 +397,6 @@ int main (void)
 
   WSAStartup(0x0202, &w);
 #endif
-  g_type_init ();
 #if !GLIB_CHECK_VERSION(2,31,8)
   g_thread_init(NULL);
 #endif
diff --git a/tests/test-io-stream-cancelling.c b/tests/test-io-stream-cancelling.c
index 55fc1f3..1aa87fb 100644
--- a/tests/test-io-stream-cancelling.c
+++ b/tests/test-io-stream-cancelling.c
@@ -112,7 +112,6 @@ int main (void)
   WSADATA w;
   WSAStartup (0x0202, &w);
 #endif
-  g_type_init ();
   g_thread_init (NULL);
 
   l_data.cancellable = g_cancellable_new ();
diff --git a/tests/test-io-stream-closing-read.c b/tests/test-io-stream-closing-read.c
index ec434dd..a8f9416 100644
--- a/tests/test-io-stream-closing-read.c
+++ b/tests/test-io-stream-closing-read.c
@@ -127,7 +127,6 @@ int main (void)
   WSADATA w;
   WSAStartup (0x0202, &w);
 #endif
-  g_type_init ();
   g_thread_init (NULL);
 
   run_io_stream_test (30, TRUE, &callbacks, (gpointer) TRUE, NULL, NULL, NULL);
diff --git a/tests/test-io-stream-closing-write.c b/tests/test-io-stream-closing-write.c
index 97e8347..1a6482e 100644
--- a/tests/test-io-stream-closing-write.c
+++ b/tests/test-io-stream-closing-write.c
@@ -127,7 +127,6 @@ int main (void)
   WSADATA w;
   WSAStartup (0x0202, &w);
 #endif
-  g_type_init ();
   g_thread_init (NULL);
 
   run_io_stream_test (30, TRUE, &callbacks, (gpointer) TRUE, NULL, NULL, NULL);
diff --git a/tests/test-io-stream-pollable.c b/tests/test-io-stream-pollable.c
index 614a546..f07139b 100644
--- a/tests/test-io-stream-pollable.c
+++ b/tests/test-io-stream-pollable.c
@@ -159,7 +159,6 @@ int main (void)
   WSADATA w;
   WSAStartup (0x0202, &w);
 #endif
-  g_type_init ();
   g_thread_init (NULL);
 
   l_data = g_malloc0 (sizeof (ThreadData));
diff --git a/tests/test-io-stream-thread.c b/tests/test-io-stream-thread.c
index db14fe4..dde2d9e 100644
--- a/tests/test-io-stream-thread.c
+++ b/tests/test-io-stream-thread.c
@@ -124,7 +124,6 @@ int main (void)
   WSADATA w;
   WSAStartup (0x0202, &w);
 #endif
-  g_type_init ();
   g_thread_init (NULL);
 
   l_data = g_malloc0 (sizeof (ThreadData));
diff --git a/tests/test-mainloop.c b/tests/test-mainloop.c
index b4e4d05..d168568 100644
--- a/tests/test-mainloop.c
+++ b/tests/test-mainloop.c
@@ -72,7 +72,6 @@ main (void)
   guint stream;
 
   nice_address_init (&addr);
-  g_type_init ();
   g_thread_init(NULL);
 
   loop = g_main_loop_new (NULL, FALSE);
diff --git a/tests/test-new-dribble.c b/tests/test-new-dribble.c
index 395e275..32f9013 100644
--- a/tests/test-new-dribble.c
+++ b/tests/test-new-dribble.c
@@ -725,8 +725,6 @@ int main(void)
   GSource *src;
   int sock;
 
-  g_type_init();
-
   global_cancellable = g_cancellable_new ();
   src = g_cancellable_source_new (global_cancellable);
   g_source_set_dummy_callback (src);
diff --git a/tests/test-pseudotcp-fuzzy.c b/tests/test-pseudotcp-fuzzy.c
index fdee222..4211248 100644
--- a/tests/test-pseudotcp-fuzzy.c
+++ b/tests/test-pseudotcp-fuzzy.c
@@ -395,7 +395,6 @@ int main (int argc, char *argv[])
   GError *error = NULL;
 
   setlocale (LC_ALL, "");
-  g_type_init ();
 
   /* Configuration. */
   context = g_option_context_new ("— fuzz-test the pseudotcp socket");
diff --git a/tests/test-pseudotcp.c b/tests/test-pseudotcp.c
index e4dd613..1a8391a 100644
--- a/tests/test-pseudotcp.c
+++ b/tests/test-pseudotcp.c
@@ -259,8 +259,6 @@ int main (int argc, char *argv[])
 
   mainloop = g_main_loop_new (NULL, FALSE);
 
-  g_type_init ();
-
   pseudo_tcp_set_debug_level (PSEUDO_TCP_DEBUG_VERBOSE);
 
   left_closed = right_closed = FALSE;
diff --git a/tests/test-restart.c b/tests/test-restart.c
index c7f2f25..e962874 100644
--- a/tests/test-restart.c
+++ b/tests/test-restart.c
@@ -400,7 +400,6 @@ int main (void)
 
   WSAStartup(0x0202, &w);
 #endif
-  g_type_init ();
   g_thread_init(NULL);
 
   global_mainloop = g_main_loop_new (NULL, FALSE);
diff --git a/tests/test-send-recv.c b/tests/test-send-recv.c
index 55e6002..71d233a 100644
--- a/tests/test-send-recv.c
+++ b/tests/test-send-recv.c
@@ -1202,7 +1202,6 @@ main (int argc, char *argv[])
   WSADATA w;
   WSAStartup (0x0202, &w);
 #endif
-  g_type_init ();
   g_thread_init (NULL);
 
   if (!long_mode) {
diff --git a/tests/test-tcp.c b/tests/test-tcp.c
index dd259a4..e2a1bfd 100644
--- a/tests/test-tcp.c
+++ b/tests/test-tcp.c
@@ -88,8 +88,6 @@ main (void)
   NiceAddress active_bind_addr, passive_bind_addr;
   GSource *srv_listen_source, *srv_input_source, *cli_input_source;
 
-  g_type_init ();
-
   mainloop = g_main_loop_new (NULL, FALSE);
 
   nice_address_init (&active_bind_addr);
diff --git a/tests/test-thread.c b/tests/test-thread.c
index df0b145..2585018 100644
--- a/tests/test-thread.c
+++ b/tests/test-thread.c
@@ -211,7 +211,6 @@ int main (void)
   WSADATA w;
   WSAStartup(0x0202, &w);
 #endif
-  g_type_init ();
   g_thread_init(NULL);
 
   lmainctx = g_main_context_new ();
diff --git a/tests/test.c b/tests/test.c
index 31a9fc7..f43d5d6 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -75,7 +75,6 @@ main (void)
 
   nice_address_init (&addr_local);
   nice_address_init (&addr_remote);
-  g_type_init ();
 
   g_thread_init(NULL);