Remove calls to the deprecated g_type_init()

13 files changed, 1 insertions, 19 deletions

diff --git a/client/cd-create-profile.c b/client/cd-create-profile.c
index 74d0d31..23f6c4d 100644
--- a/client/cd-create-profile.c
+++ b/client/cd-create-profile.c
@@ -881,7 +881,6 @@ main (int argc, char **argv)
 	};
 
 	setlocale (LC_ALL, "");
-	g_type_init ();
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
diff --git a/client/cd-find-broken.c b/client/cd-find-broken.c
index 9f7a7d5..7023ea6 100644
--- a/client/cd-find-broken.c
+++ b/client/cd-find-broken.c
@@ -180,8 +180,6 @@ main (int argc, char *argv[])
 
 	setlocale (LC_ALL, "");
 
-	g_type_init ();
-
 	/* create CSV headers */
 	priv = g_new0 (CdFindBrokenPriv, 1);
 	priv->csv_all = g_string_new ("filename,vendor,model,serial,data_source,version,cmf_binary,cmf_version\n");
diff --git a/client/cd-fix-profile.c b/client/cd-fix-profile.c
index 721ab5a..fc22a21 100644
--- a/client/cd-fix-profile.c
+++ b/client/cd-fix-profile.c
@@ -746,8 +746,6 @@ main (int argc, char *argv[])
 	textdomain (GETTEXT_PACKAGE);
 	cmsSetLogErrorHandler (cd_util_lcms_error_cb);
 
-	g_type_init ();
-
 	/* create helper object */
 	priv = g_new0 (CdUtilPrivate, 1);
 	priv->client = cd_client_new ();
diff --git a/client/cd-iccdump.c b/client/cd-iccdump.c
index f10b924..fcf1a9e 100644
--- a/client/cd-iccdump.c
+++ b/client/cd-iccdump.c
@@ -90,7 +90,6 @@ main (int argc, char **argv)
 	guint retval = EXIT_FAILURE;
 
 	setlocale (LC_ALL, "");
-	g_type_init ();
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
diff --git a/client/cd-util.c b/client/cd-util.c
index fdde6e9..be7907c 100644
--- a/client/cd-util.c
+++ b/client/cd-util.c
@@ -2062,8 +2062,6 @@ main (int argc, char *argv[])
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	g_type_init ();
-
 	/* create helper object */
 	priv = g_new0 (CdUtilPrivate, 1);
 
diff --git a/configure.ac b/configure.ac
index 703a995..5950242 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,7 @@ AC_SUBST([RELRO_LDFLAGS])
 dnl ---------------------------------------------------------------------------
 dnl - Check library dependencies
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gio-unix-2.0 gmodule-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.36.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gio-unix-2.0 gmodule-2.0)
 AC_ARG_ENABLE(gusb, AS_HELP_STRING([--enable-gusb],[Enable GUSB support]),
 	      enable_gusb=$enableval, enable_gusb=yes)
 if test x$enable_gusb != xno; then
diff --git a/contrib/colord-sane/cd-main.c b/contrib/colord-sane/cd-main.c
index 652c7c1..4a42247 100644
--- a/contrib/colord-sane/cd-main.c
+++ b/contrib/colord-sane/cd-main.c
@@ -373,9 +373,6 @@ main (int argc, char *argv[])
 
 	/* We need to init DBus' threading support as libSANE uses raw DBus */
 	dbus_threads_init_default ();
-#if !GLIB_CHECK_VERSION(2,36,0)
-	g_type_init ();
-#endif
 
 	/* create new objects */
 	priv = g_new0 (CdMainPrivate, 1);
diff --git a/contrib/session-helper/cd-main.c b/contrib/session-helper/cd-main.c
index 496d2c1..f541c5d 100644
--- a/contrib/session-helper/cd-main.c
+++ b/contrib/session-helper/cd-main.c
@@ -2170,7 +2170,6 @@ main (int argc, char *argv[])
 
 	setlocale (LC_ALL, "");
 
-	g_type_init ();
 	priv = g_new0 (CdMainPrivate, 1);
 	priv->gamma_scale_factor = 10.0f;
 	priv->status = CD_SESSION_STATUS_IDLE;
diff --git a/lib/colord/cd-self-test.c b/lib/colord/cd-self-test.c
index c59d6b4..5263099 100644
--- a/lib/colord/cd-self-test.c
+++ b/lib/colord/cd-self-test.c
@@ -3714,7 +3714,6 @@ colord_transform_func (void)
 int
 main (int argc, char **argv)
 {
-	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 
 	/* only critical and error are fatal */
diff --git a/lib/colorhug/ch-self-test.c b/lib/colorhug/ch-self-test.c
index bbfaa9d..e2c4de6 100644
--- a/lib/colorhug/ch-self-test.c
+++ b/lib/colorhug/ch-self-test.c
@@ -1198,7 +1198,6 @@ out:
 int
 main (int argc, char **argv)
 {
-	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 
 	/* only critical and error are fatal */
diff --git a/src/cd-main.c b/src/cd-main.c
index f79512a..88da23b 100644
--- a/src/cd-main.c
+++ b/src/cd-main.c
@@ -2447,7 +2447,6 @@ main (int argc, char *argv[])
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	g_type_init ();
 	priv = g_new0 (CdMainPrivate, 1);
 
 	/* TRANSLATORS: program name */
diff --git a/src/cd-self-test.c b/src/cd-self-test.c
index 9ac078f..10c09b1 100644
--- a/src/cd-self-test.c
+++ b/src/cd-self-test.c
@@ -475,7 +475,6 @@ cd_device_db_func (void)
 int
 main (int argc, char **argv)
 {
-	g_type_init ();
 	g_test_init (&argc, &argv, NULL);
 
 	/* only critical and error are fatal */
diff --git a/src/sensors/cd-sensor-dump.c b/src/sensors/cd-sensor-dump.c
index acca1e2..7bf9d7b 100644
--- a/src/sensors/cd-sensor-dump.c
+++ b/src/sensors/cd-sensor-dump.c
@@ -62,8 +62,6 @@ main (int argc, char **argv)
 
 	setlocale (LC_ALL, "");
 
-	g_type_init ();
-
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);