diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 12:13:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 12:13:19 +0000 |
| commit | 0d80d9fedb774f6ae292aa1c27bba1694095326b (patch) | |
| tree | 3811cad97dc7314f66801bdd72d6f52218f568ca /shell/source/backends/gconfbe | |
| parent | 08d90e118aa5d789e6b197ed38f90dade1517dc1 (diff) | |
INTEGRATION: CWS vcl35 (1.2.32); FILE MERGED
2005/01/20 11:09:57 obr 1.2.32.1: #i41020# check libORBit-2 version to avoid deadlocks during startup
Diffstat (limited to 'shell/source/backends/gconfbe')
| -rw-r--r-- | shell/source/backends/gconfbe/gconfbecdef.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/shell/source/backends/gconfbe/gconfbecdef.cxx b/shell/source/backends/gconfbe/gconfbecdef.cxx index a2a971ebca3e..400b5b135cf0 100644 --- a/shell/source/backends/gconfbe/gconfbecdef.cxx +++ b/shell/source/backends/gconfbe/gconfbecdef.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gconfbecdef.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-09-17 13:01:02 $ + * last change: $Author: rt $ $Date: 2005-01-31 13:13:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,7 @@ #include "uno/current_context.hxx" #include <stdio.h> +#include <orbit/orbit.h> namespace css = com::sun::star ; namespace uno = css::uno ; @@ -102,7 +103,11 @@ static uno::Reference<uno::XInterface> SAL_CALL createGconfBackend(const uno::Re rtl::OUString aDesktopEnvironment; if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsAscii("GNOME")) ) { - return * GconfBackend::createInstance(xContext); + // 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); + } } } |