Kaydet (Commit) 025857d8 authored tarafından Ivan Timofeev's avatar Ivan Timofeev Kaydeden (comit) Caolán McNamara

WaE: g_type_init has been deprecated since GLib 2.36

Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829
Reviewed-on: https://gerrit.libreoffice.org/3434Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 6a0f56b0
...@@ -51,8 +51,10 @@ GConfClient* getGconfClient() ...@@ -51,8 +51,10 @@ GConfClient* getGconfClient()
static GConfClient* mClient= 0; static GConfClient* mClient= 0;
if (mClient == NULL) if (mClient == NULL)
{ {
#if !defined(GLIB_VERSION_2_36)
/* initialize glib object type library */ /* initialize glib object type library */
g_type_init(); g_type_init();
#endif
GError* aError = NULL; GError* aError = NULL;
if (!gconf_init(0, NULL, &aError)) if (!gconf_init(0, NULL, &aError))
......
...@@ -62,7 +62,9 @@ namespace shell { namespace sessioninstall ...@@ -62,7 +62,9 @@ namespace shell { namespace sessioninstall
{ {
SyncDbusSessionHelper::SyncDbusSessionHelper(Reference<XComponentContext> const&) SyncDbusSessionHelper::SyncDbusSessionHelper(Reference<XComponentContext> const&)
{ {
#if !defined(GLIB_VERSION_2_36)
g_type_init (); g_type_init ();
#endif
} }
void SAL_CALL SyncDbusSessionHelper::InstallPackageNames( const ::sal_uInt32 nXid, const Sequence< OUString >& vPackages, const OUString& sInteraction ) throw (RuntimeException) void SAL_CALL SyncDbusSessionHelper::InstallPackageNames( const ::sal_uInt32 nXid, const Sequence< OUString >& vPackages, const OUString& sInteraction ) throw (RuntimeException)
{ {
......
...@@ -885,7 +885,9 @@ TeleManagerImpl::TeleManagerImpl() ...@@ -885,7 +885,9 @@ TeleManagerImpl::TeleManagerImpl()
mpFileTransferClient( NULL), mpFileTransferClient( NULL),
mpAccountManager( NULL) mpAccountManager( NULL)
{ {
#if !defined(GLIB_VERSION_2_36)
g_type_init(); g_type_init();
#endif
} }
TeleManagerImpl::~TeleManagerImpl() TeleManagerImpl::~TeleManagerImpl()
......
...@@ -100,9 +100,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( co ...@@ -100,9 +100,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( co
uno::Reference< lang::XMultiServiceFactory > xSMgr uno::Reference< lang::XMultiServiceFactory > xSMgr
(reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< lang::XSingleServiceFactory > xFactory; uno::Reference< lang::XSingleServiceFactory > xFactory;
#if !defined(GLIB_VERSION_2_36)
g_type_init(); g_type_init();
#endif
if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) ) if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) )
xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr ); xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment