diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-15 15:14:13 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-12-16 20:31:47 +0000 |
| commit | bd05312da42cfd91e74376cab0f243253edcec60 (patch) | |
| tree | f9982e51856459e114f53ee318cce240811d2ea7 /vcl | |
| parent | f307d1a01a4eeb3e4c9ee207aa0385c8c4586806 (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
(cherry picked from commit 3bb7557d541328194eae928fda32b73650f13360)
Change-Id: I246120f2430b92cd2d3e5003445aa4c9da4f6a68
Reviewed-on: https://gerrit.libreoffice.org/20721
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 2d8e26ca5dac..445ae0a61772 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -709,6 +709,7 @@ void GtkData::Init() exit(0); } +#if !GTK_CHECK_VERSION(3,0,0) /* * if a -display switch was used, we need * to set the environment accoringly since @@ -719,6 +720,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 ); |