[Libreoffice-commits] core.git: shell/source tubes/source ucb/source

[Ivan Timofeev]

 shell/source/backends/gconfbe/gconfaccess.cxx         |    2 +-
 shell/source/sessioninstall/SyncDbusSessionHelper.cxx |    2 +-
 tubes/source/manager.cxx                              |    2 +-
 ucb/source/ucp/gio/gio_provider.cxx                   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9dd52eb86a9122e34c307a9160ae3ccd5706c94e
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Fri Apr 19 17:41:20 2013 +0400

    use GLIB_CHECK_VERSION instead of GLIB_VERSION_X_XX
    
    Michael Meeks pointed out that the latter can cause problems.
    
    Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93

diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index d5b864d..d1b4b0d 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,7 +51,7 @@ GConfClient* getGconfClient()
     static GConfClient* mClient= 0;
     if (mClient == NULL)
     {
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
         /* initialize glib object type library */
         g_type_init();
 #endif
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index a39c847..49c1344 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -62,7 +62,7 @@ namespace shell { namespace sessioninstall
 {
     SyncDbusSessionHelper::SyncDbusSessionHelper(Reference<XComponentContext> const&)
     {
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
         g_type_init ();
 #endif
     }
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index a7acc3f..c5b5c39 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -885,7 +885,7 @@ TeleManagerImpl::TeleManagerImpl()
         mpFileTransferClient( NULL),
         mpAccountManager( NULL)
 {
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
 #endif
 }
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index acd6e14..6737417 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -100,7 +100,7 @@ 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)
+#if !GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
 #endif
     if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) )