strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't check for ORBit < 2.8

Browse source 
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.
This commit is contained in:
Ross Burton 2012-04-18 21:26:38 +01:00 committed by Michael Meeks
parent 126e58925b
commit a219edfbb6
3 changed files with 2 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shell/source/backends/gconfbe/gconfbackend.cxx
View file

@ -61,7 +61,6 @@
#include "uno/lbnames.h" #include "uno/lbnames.h"
#include "gconfaccess.hxx" #include "gconfaccess.hxx"
#include "orbit.h"
namespace { namespace {
@ -165,8 +164,7 @@ Service::Service(): enabled_(false) {
rtl::OUString( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
desktop; desktop;
enabled_ = desktop == "GNOME" && ((orbit_major_version == 2 && orbit_minor_version >= 8) || orbit_major_version > 2); enabled_ = desktop == "GNOME";
// ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin
} }
} }

2
shell/source/backends/gconfbe/makefile.mk
View file

@ -46,7 +46,7 @@ CFLAGS+=-DENABLE_LOCKDOWN
.IF "$(ENABLE_GCONF)"!="" .IF "$(ENABLE_GCONF)"!=""
COMPILER_WARN_ALL=TRUE 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 .INCLUDE: pkg_config.mk
.IF "$(OS)" == "SOLARIS" .IF "$(OS)" == "SOLARIS"

42
shell/source/backends/gconfbe/orbit.h
View file

@ -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: */