gconf: Avoid calling deprecated function if possible

g_type_init() is need no longer be called explicitly from glib 2.36
onwards.

diff --git a/src/modules/gconf/gconf-helper.c b/src/modules/gconf/gconf-helper.c
index fbd8cfd83808ef2659814ef4142173d5aa174d68..3c1180c745d04088fe4e91e531d1662d303359f6 100644 (file)
--- a/src/modules/gconf/gconf-helper.c
+++ b/src/modules/gconf/gconf-helper.c
@@ -99,7 +99,9 @@ int main(int argc, char *argv[]) {
     GConfClient *client;
     GSList *modules, *m;
 
+#if !GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
+#endif
 
     if (!(client = gconf_client_get_default()))
         goto fail;