shell/source/backends/gconfbe/gconfbackend.cxx | 6 --- shell/source/backends/gconfbe/makefile.mk | 2 - shell/source/backends/gconfbe/orbit.h | 42 ------------------------- 3 files changed, 2 insertions(+), 48 deletions(-)
New commits: commit a91f9b10edc31f3c4ad7209f97924990cc5b6796 Author: Ross Burton <[email protected]> Date: Wed Apr 18 21:26:38 2012 +0100 Don't check for ORBit < 2.8 ORBit 2.8 was released in 2003 so let's assume that this isn't being used. Also the assumption is that it's coming in through GConf, which isn't true with GConf 3 onwards, released July 2011. Conflicts: shell/source/backends/gconfbe/gconfbackend.cxx Signed-off-by: Michael Meeks <[email protected]> diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index bff67fa..0de577a 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -61,7 +61,6 @@ #include "uno/lbnames.h" #include "gconfaccess.hxx" -#include "orbit.h" namespace { @@ -165,10 +164,7 @@ Service::Service(): enabled_(false) { rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= desktop; - enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME")) && - ((orbit_major_version == 2 && orbit_minor_version >= 8) || - orbit_major_version > 2); - // ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin + enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME")); } } diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk index 9e77a08..84ec3db 100644 --- a/shell/source/backends/gconfbe/makefile.mk +++ b/shell/source/backends/gconfbe/makefile.mk @@ -46,7 +46,7 @@ CFLAGS+=-DENABLE_LOCKDOWN .IF "$(ENABLE_GCONF)"!="" COMPILER_WARN_ALL=TRUE -PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 ORBit-2.0 glib-2.0 +PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 glib-2.0 .INCLUDE: pkg_config.mk .IF "$(OS)" == "SOLARIS" diff --git a/shell/source/backends/gconfbe/orbit.h b/shell/source/backends/gconfbe/orbit.h deleted file mode 100755 index 82673a3..0000000 --- a/shell/source/backends/gconfbe/orbit.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_GCONFBE_ORBIT_H -#define INCLUDED_SHELL_SOURCE_BACKENDS_GCONFBE_ORBIT_H - -#include "sal/config.h" - -#if defined __GNUC__ -#pragma GCC system_header -#endif - -#include <orbit/orbit.h> - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
