Kaydet (Commit) 3bb7557d authored tarafından Caolán McNamara's avatar Caolán McNamara

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
üst 1cb87bf3
...@@ -730,6 +730,7 @@ void GtkData::Init() ...@@ -730,6 +730,7 @@ void GtkData::Init()
aOrigXIOErrorHandler = XSetIOErrorHandler(XIOErrorHdl); aOrigXIOErrorHandler = XSetIOErrorHandler(XIOErrorHdl);
#endif #endif
#if !GTK_CHECK_VERSION(3,0,0)
/* /*
* if a -display switch was used, we need * if a -display switch was used, we need
* to set the environment accoringly since * to set the environment accoringly since
...@@ -740,6 +741,7 @@ void GtkData::Init() ...@@ -740,6 +741,7 @@ void GtkData::Init()
const gchar *name = gdk_display_get_name( pGdkDisp ); const gchar *name = gdk_display_get_name( pGdkDisp );
OUString envValue(name, strlen(name), aEnc); OUString envValue(name, strlen(name), aEnc);
osl_setEnvironment(envVar.pData, envValue.pData); osl_setEnvironment(envVar.pData, envValue.pData);
#endif
GtkSalDisplay *pDisplay = new GtkSalDisplay( pGdkDisp ); GtkSalDisplay *pDisplay = new GtkSalDisplay( pGdkDisp );
SetDisplay( pDisplay ); SetDisplay( pDisplay );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment