TEMPLATE.SOURCECODE.HEADER | 30 ++--------------- shell/source/backends/gconfbe/gconfbackend.cxx | 4 -- shell/source/backends/gconfbe/makefile.mk | 2 - shell/source/backends/gconfbe/orbit.h | 42 ------------------------- 4 files changed, 6 insertions(+), 72 deletions(-)
New commits: commit e40e42ffeaa56c2f66b71c58190774cc70d20343 Author: Michael Meeks <michael.me...@suse.com> Date: Thu Apr 19 15:01:03 2012 +0100 update header template to MPLv2 cf. ESC minutes. diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER index cae6935..1d7331c 100644 --- a/TEMPLATE.SOURCECODE.HEADER +++ b/TEMPLATE.SOURCECODE.HEADER @@ -1,32 +1,10 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * Copyright 2012 LibreOffice contributors. * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * Major Contributor(s): -<<<<<<< - * [ Copyright (C) 2012 Jim Bob <j...@bob.org> (initial developer) ] - * [ Copyright (C) 2012 Ted <t...@bear.com> ] ->>>>>>> - * - * All Rights Reserved. - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit a219edfbb65e6623dde2d52c41547d78346b7144 Author: Ross Burton <ross.bur...@intel.com> 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. diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 57a1a4e..82ea9fe 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,8 +164,7 @@ Service::Service(): enabled_(false) { rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= desktop; - enabled_ = desktop == "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 == "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 100644 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 Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits