From: Arun Raghavan <arun@accosted.net>
Date: Tue, 22 Apr 2014 07:35:19 +0000 (+0530)
Subject: gconf: Avoid calling deprecated function if possible
X-Git-Url: https://code.delx.au/pulseaudio/commitdiff_plain/c78860c97bf896c40bb1d8750835c40deeb198d1?ds=sidebyside

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 fbd8cfd8..3c1180c7 100644
--- 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;