diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/backends/gconfbe/gconfbecdef.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/shell/source/backends/gconfbe/gconfbecdef.cxx b/shell/source/backends/gconfbe/gconfbecdef.cxx index 1efb2d72ff86..8cbaa40639f9 100644 --- a/shell/source/backends/gconfbe/gconfbecdef.cxx +++ b/shell/source/backends/gconfbe/gconfbecdef.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gconfbecdef.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:47:01 $ + * last change: $Author: obo $ $Date: 2006-03-22 09:34:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,18 +71,22 @@ static uno::Reference<uno::XInterface> SAL_CALL createGconfBackend(const uno::Re if (xCurrentContext.is()) { +#ifndef ENABLE_LOCKDOWN uno::Any aValue = xCurrentContext->getValueByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "system.desktop-environment" ) ) ); rtl::OUString aDesktopEnvironment; if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsAscii("GNOME")) ) { +#endif // ! ENABLE_LOCKDOWN // ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin if ( (orbit_major_version >= 2) && (orbit_minor_version >= 8) ) { return * GconfBackend::createInstance(xContext); } +#ifndef ENABLE_LOCKDOWN } +#endif // ! ENABLE_LOCKDOWN } return uno::Reference<uno::XInterface>(); |