[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/gtkdata.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0f36a1d549e6d3521884f7c36013d15f07cd5bf9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 15 15:14:13 2015 +0000

    Resolves: rhbz#1285364 urls cannot be opened under wayland
    
    because we're setting DISPLAY always, and under wayland that resolves to
    "wayland", not the original ":0" so the gtk2 gvfs-open eventually called open
    xdg-open cannot open the correct display
    
    Change-Id: I246120f2430b92cd2d3e5003445aa4c9da4f6a68
    (cherry picked from commit 3bb7557d541328194eae928fda32b73650f13360)

diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index f65b4e0..b5c64e0 100644
--- a/vcl/unx/gtk/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
@@ -730,6 +730,7 @@ void GtkData::Init()
         aOrigXIOErrorHandler = XSetIOErrorHandler(XIOErrorHdl);
 #endif
 
+#if !GTK_CHECK_VERSION(3,0,0)
     /*
      * if a -display switch was used, we need
      * to set the environment accoringly since
@@ -740,6 +741,7 @@ void GtkData::Init()
     const gchar *name = gdk_display_get_name( pGdkDisp );
     OUString envValue(name, strlen(name), aEnc);
     osl_setEnvironment(envVar.pData, envValue.pData);
+#endif
 
     GtkSalDisplay *pDisplay = new GtkSalDisplay( pGdkDisp );
     SetDisplay( pDisplay );