[Libreoffice-commits] core.git: Branch 'aoo/trunk' - shell/source

[Damjan Jovanovic]

 shell/source/backends/gconfbe/gconfbackend.cxx |   10 ++++++----
 shell/source/backends/gconfbe/makefile.mk      |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit b0c860663b2417870bb6757ddf28663eea90d0c8
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Sat Oct 21 06:15:07 2017 +0000

    Don't require ORbit to compile. We never really needed it:
    
    GConf makes its own CORBA connection if it needs to, and
    the only reason we included orbit.h is to check whether
    the problematic version < 2.8 was present, as it deadlocks
    the GTK VCL plugin.
    
    But ORbit 2.8 was released in 2003, and GConf doesn't
    even use CORBA connections any more. So drop the check
    and stop needing ORBit altogether.
    
    Patch by: me

diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index 7aa55147f84e..fd9c742a50e7 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -57,7 +57,6 @@
 #include "uno/lbnames.h"
 
 #include "gconfaccess.hxx"
-#include "orbit.h"
 
 namespace {
 
@@ -161,10 +160,13 @@ 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);
+        enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME"))
             // ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin
+            // But ORBit-2 version 2.8 was released in 2003 and ORBit is almost obsolete now.
+            /* &&
+            ((orbit_major_version == 2 && orbit_minor_version >= 8) ||
+             orbit_major_version > 2)*/;
+
     }
 }
 
diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk
index e507e6ba3e39..39eb50825cc0 100644
--- a/shell/source/backends/gconfbe/makefile.mk
+++ b/shell/source/backends/gconfbe/makefile.mk
@@ -42,7 +42,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"