summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Timofeev <timofeev.i.s@gmail.com>2013-04-17 20:04:45 +0400
committerStephan Bergmann <sbergman@redhat.com>2013-08-23 15:50:37 +0200
commit906e5677ae9255ff2aac735ce6e91ab222ba58e6 (patch)
treed40876f5c6ae157ac278448fadb495ee5212af49
parent5ea8066a58a3dc1eb19f59849a37100d26183f2b (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> (cherry picked from commit 025857d81d4781a95cda4e790808b05b97eb97d9)
-rw-r--r--shell/source/backends/gconfbe/gconfaccess.cxx2
-rw-r--r--shell/source/sessioninstall/SyncDbusSessionHelper.cxx2
-rw-r--r--tubes/source/manager.cxx2
-rw-r--r--ucb/source/ucp/gio/gio_provider.cxx4
4 files changed, 8 insertions, 2 deletions
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 205a2cf3f1a9..532fd1003929 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 47f0749400a4..996754875fe2 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)
{
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index b924e8f790df..a3c8990fdbb1 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -889,7 +889,9 @@ TeleManagerImpl::TeleManagerImpl()
mpFileTransferClient( NULL),
mpAccountManager( NULL)
{
+#if !defined(GLIB_VERSION_2_36)
g_type_init();
+#endif
}
TeleManagerImpl::~TeleManagerImpl()
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 93ec2d4d6704..c95117bee6cb 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -100,9 +100,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( co
uno::Reference< lang::XMultiServiceFactory > xSMgr
(reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< lang::XSingleServiceFactory > xFactory;
-
+#if !defined(GLIB_VERSION_2_36)
g_type_init();
-
+#endif
if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) )
xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr );