Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3434
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/3434/1
WaE: g_type_init has been deprecated since GLib 2.36
Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829
---
M shell/source/backends/gconfbe/gconfaccess.cxx
M shell/source/sessioninstall/SyncDbusSessionHelper.cxx
M tubes/source/manager.cxx
M ucb/source/ucp/gio/gio_provider.cxx
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx
b/shell/source/backends/gconfbe/gconfaccess.cxx
index 1a1131c..d5b864d 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,8 +51,10 @@
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 e833784..a39c847 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -62,7 +62,9 @@
{
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 70d9e44..a7acc3f 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -885,7 +885,9 @@
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 aad78b3..acd6e14 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -100,9 +100,9 @@
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 );
--
To view, visit https://gerrit.libreoffice.org/3434
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ivan Timofeev <timofeev.i.s@gmail.com>
Context
- [PATCH] WaE: g_type_init has been deprecated since GLib 2.36 · Ivan Timofeev (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.