diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-15 15:14:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-15 15:16:27 +0000 |
| commit | 0f36a1d549e6d3521884f7c36013d15f07cd5bf9 (patch) | |
| tree | d4138452fe61a9a21cef1596192e8d14404b957c /vcl/unx | |
| parent | 68a098da2caffad9450a841e9a5d31fb0642fd3c (diff) | |
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)
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk/gtkdata.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx index f65b4e0a7567..b5c64e05d302 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 ); |