Remove calls to deprecated g_type_init() function

Since GLib 2.36 the type system is initialised automatically and g_type_init() function does nothing.
sailfishos · Mar 14, 2014 · 4c5e5bb · 4c5e5bb
1 parent 7a56637
commit 4c5e5bb
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/mce.c b/mce.c
@@ -886,9 +886,6 @@ int main(int argc, char **argv)
 	if (daemonflag == TRUE)
 		daemonize();
 
-	/* Initialise GType system */
-	g_type_init();
-
 	/* Register a mainloop */
 	mainloop = g_main_loop_new(NULL, FALSE);
 

diff --git a/rpm/mce.spec b/rpm/mce.spec
@@ -16,7 +16,7 @@ BuildRequires:  pkgconfig(dbus-1) >= 1.0.2
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(dsme) >= 0.58
 BuildRequires:  pkgconfig(gconf-2.0)
-BuildRequires:  pkgconfig(glib-2.0) >= 2.18.0
+BuildRequires:  pkgconfig(glib-2.0) >= 2.36.0
 BuildRequires:  pkgconfig(mce) >= 1.12.4
 BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  kernel-headers >= 2.6.32

diff --git a/tools/mcetool.c b/tools/mcetool.c
@@ -3044,9 +3044,6 @@ int main(int argc, char **argv)
 {
         int exitcode = EXIT_FAILURE;
 
-        /* Init GType */
-        g_type_init();
-
         /* No args -> show mce status */
         if( argc < 2 )
                 xmce_get_status();