summaryrefslogtreecommitdiff
path: root/shell/source/backends/gconfbe/gconfaccess.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'shell/source/backends/gconfbe/gconfaccess.cxx')
-rw-r--r--shell/source/backends/gconfbe/gconfaccess.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 1a1131cd828c..d5b864d72d1a 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,8 +51,10 @@ GConfClient* getGconfClient()
static GConfClient* mClient= 0;
if (mClient == NULL)
{
+#if !defined(GLIB_VERSION_2_36)
/* initialize glib object type library */
g_type_init();
+#endif
GError* aError = NULL;
if (!gconf_init(0, NULL, &aError))