Drop unneed g_type_init calls

We have been requiring a new-enough GLib for a while now,
so drop this unnecessary clutter.

12 files changed, 0 insertions, 51 deletions

diff --git a/gdk-pixbuf/gdk-pixbuf-csource.c b/gdk-pixbuf/gdk-pixbuf-csource.c
index 642d5ee36..0292d7a9e 100644
--- a/gdk-pixbuf/gdk-pixbuf-csource.c
+++ b/gdk-pixbuf/gdk-pixbuf-csource.c
@@ -76,11 +76,6 @@ main (int   argc,
   GError *error = NULL;
   gchar *infilename;
 
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-  /* initialize gtype */
-  g_type_init ();
-#endif
-
   /* parse args and do fast exits */
   parse_args (&argc, &argv);
 
diff --git a/gdk-pixbuf/gdk-pixbuf-pixdata.c b/gdk-pixbuf/gdk-pixbuf-pixdata.c
index 4c5053c04..18b219fce 100644
--- a/gdk-pixbuf/gdk-pixbuf-pixdata.c
+++ b/gdk-pixbuf/gdk-pixbuf-pixdata.c
@@ -55,11 +55,6 @@ main (int   argc,
   guint8 *data;
   guint data_len;
 
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-  /* initialize GType */
-  g_type_init ();
-#endif
-
   /* parse args and do fast exits */
   parse_args (&argc, &argv);
 
diff --git a/gdk-pixbuf/make-inline-pixbuf.c b/gdk-pixbuf/make-inline-pixbuf.c
index d48c155c7..2df2179b6 100644
--- a/gdk-pixbuf/make-inline-pixbuf.c
+++ b/gdk-pixbuf/make-inline-pixbuf.c
@@ -153,10 +153,6 @@ main (int argc, char **argv)
   gchar *outfilename;
   int i;
 
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-  g_type_init ();
-#endif
-
   if (argc < 4)
     usage ();
 
diff --git a/gdk-pixbuf/test-gdk-pixbuf.c b/gdk-pixbuf/test-gdk-pixbuf.c
index 27adffec4..4c6ef0228 100644
--- a/gdk-pixbuf/test-gdk-pixbuf.c
+++ b/gdk-pixbuf/test-gdk-pixbuf.c
@@ -230,10 +230,6 @@ main (int argc, char **argv)
 
 	result = EXIT_SUCCESS;
 
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-	g_type_init ();
-#endif
-
 	/* Run some tests. */
 	if (!simple_composite_test ()) {
 		result = EXIT_FAILURE;
diff --git a/tests/pixbuf-icc.c b/tests/pixbuf-icc.c
index 7d2f0dae1..9cb9c9021 100644
--- a/tests/pixbuf-icc.c
+++ b/tests/pixbuf-icc.c
@@ -74,10 +74,6 @@ test_nonincremental (gconstpointer data)
 int
 main (int argc, char **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-  g_type_init ();
-#endif
-
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_data_func ("/pixbuf/icc/png", "icc-profile.png", test_nonincremental);
diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c
index ae4fb47b4..43332886a 100644
--- a/tests/pixbuf-lowmem.c
+++ b/tests/pixbuf-lowmem.c
@@ -197,9 +197,6 @@ main (int argc, char **argv)
   /* Set a malloc which emulates low mem */
   g_mem_set_vtable (&limited_table);
   
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-  g_type_init ();
-#endif
   g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);
   
   /* memory tests */
diff --git a/tests/pixbuf-random.c b/tests/pixbuf-random.c
index c1cabb5e9..0e01b7f42 100644
--- a/tests/pixbuf-random.c
+++ b/tests/pixbuf-random.c
@@ -126,9 +126,6 @@ main (int argc, char **argv)
     }
   g_print ("the last tested image is saved to the file \"pixbuf-random-image\"\n\n");
 
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-  g_type_init ();
-#endif
   g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);
   
   g_random_set_seed (seed);
diff --git a/tests/pixbuf-randomly-modified.c b/tests/pixbuf-randomly-modified.c
index 22452417e..2f599816a 100644
--- a/tests/pixbuf-randomly-modified.c
+++ b/tests/pixbuf-randomly-modified.c
@@ -152,9 +152,6 @@ main (int argc, char **argv)
   if (verbose)
     g_print ("the last tested image is saved to pixbuf-randomly-modified-image\n");
 
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-  g_type_init ();
-#endif
   g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);
 
   if (files->len == 0)
diff --git a/tests/pixbuf-read.c b/tests/pixbuf-read.c
index c2e330033..b59479ff9 100644
--- a/tests/pixbuf-read.c
+++ b/tests/pixbuf-read.c
@@ -52,9 +52,6 @@ main (int argc, char **argv)
 {
   int i;
 
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-  g_type_init ();
-#endif
   g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);
 
   if (argc == 1)
diff --git a/tests/pixbuf-resource.c b/tests/pixbuf-resource.c
index 3a4b05995..a747bca58 100644
--- a/tests/pixbuf-resource.c
+++ b/tests/pixbuf-resource.c
@@ -126,10 +126,6 @@ test_resource_at_scale (void)
 int
 main (int argc, char **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-  g_type_init ();
-#endif
-
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/pixbuf/resource", test_resource);
diff --git a/tests/pixbuf-stream.c b/tests/pixbuf-stream.c
index 4ddcd7b26..0c2cebed0 100644
--- a/tests/pixbuf-stream.c
+++ b/tests/pixbuf-stream.c
@@ -182,10 +182,6 @@ test_stream_at_scale_async (gconstpointer data)
 int
 main (int argc, char **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-  g_type_init ();
-#endif
-
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_data_func ("/pixbuf/stream", "icc-profile.png", test_stream);
diff --git a/tests/pixbuf-threads.c b/tests/pixbuf-threads.c
index 8af6acfda..588c0f88b 100644
--- a/tests/pixbuf-threads.c
+++ b/tests/pixbuf-threads.c
@@ -88,15 +88,6 @@ main (int argc, char **argv)
 
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION (2, 35, 3)
-  g_type_init ();
-#endif
-
-#if !GLIB_CHECK_VERSION (2, 32, 0)
-  if (!g_thread_supported ())
-    g_thread_init (NULL);
-#endif
-
   if (g_getenv ("ITERATIONS"))
     iterations = atoi (g_getenv ("ITERATIONS"));
   else