summaryrefslogtreecommitdiff
path: root/shell/source
diff options
context:
space:
mode:
authorIvan Timofeev <timofeev.i.s@gmail.com>2013-04-17 20:04:45 +0400
committerCaolán McNamara <caolanm@redhat.com>2013-04-18 09:19:46 +0000
commit025857d81d4781a95cda4e790808b05b97eb97d9 (patch)
tree52a254db19e56a5d1d403612d551547732b5e4a8 /shell/source
parent6a0f56b09d978e516846814062785a157c3ddbde (diff)
WaE: g_type_init has been deprecated since GLib 2.36
Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829 Reviewed-on: https://gerrit.libreoffice.org/3434 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'shell/source')
-rw-r--r--shell/source/backends/gconfbe/gconfaccess.cxx2
-rw-r--r--shell/source/sessioninstall/SyncDbusSessionHelper.cxx2
2 files changed, 4 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))
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<XComponentContext> 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)
{