gconf: Avoid calling deprecated function if possible
authorArun Raghavan <arun@accosted.net>
Tue, 22 Apr 2014 07:35:19 +0000 (13:05 +0530)
committerTanu Kaskinen <tanu.kaskinen@linux.intel.com>
Sat, 26 Apr 2014 08:32:45 +0000 (11:32 +0300)
g_type_init() is need no longer be called explicitly from glib 2.36
onwards.

src/modules/gconf/gconf-helper.c

index fbd8cfd..3c1180c 100644 (file)
@@ -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;