From 025857d81d4781a95cda4e790808b05b97eb97d9 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Wed, 17 Apr 2013 20:04:45 +0400 Subject: WaE: g_type_init has been deprecated since GLib 2.36 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829 Reviewed-on: https://gerrit.libreoffice.org/3434 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- shell/source/backends/gconfbe/gconfaccess.cxx | 2 ++ shell/source/sessioninstall/SyncDbusSessionHelper.cxx | 2 ++ 2 files changed, 4 insertions(+) (limited to 'shell') 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)) diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx index e8337845c303..a39c847cd47c 100644 --- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx +++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx @@ -62,7 +62,9 @@ namespace shell { namespace sessioninstall { SyncDbusSessionHelper::SyncDbusSessionHelper(Reference const&) { +#if !defined(GLIB_VERSION_2_36) g_type_init (); +#endif } void SAL_CALL SyncDbusSessionHelper::InstallPackageNames( const ::sal_uInt32 nXid, const Sequence< OUString >& vPackages, const OUString& sInteraction ) throw (RuntimeException) { -- cgit v1.2.3