diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-04-17 20:04:45 +0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-18 09:19:46 +0000 |
| commit | 025857d81d4781a95cda4e790808b05b97eb97d9 (patch) | |
| tree | 52a254db19e56a5d1d403612d551547732b5e4a8 | |
| parent | 6a0f56b09d978e516846814062785a157c3ddbde (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>
| -rw-r--r-- | shell/source/backends/gconfbe/gconfaccess.cxx | 2 | ||||
| -rw-r--r-- | shell/source/sessioninstall/SyncDbusSessionHelper.cxx | 2 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/gio/gio_provider.cxx | 4 |
4 files changed, 8 insertions, 2 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) { diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 70d9e44b87a0..a7acc3fc4692 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -885,7 +885,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 aad78b37afcc..acd6e14aca23 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 ); |