mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-10 19:00:08 +00:00
wayland: require WAYLAND_DISPLAY be set to open wayland display
The wayland client libraries now require WAYLAND_DISPLAY be set to use them. See: http://cgit.freedesktop.org/wayland/wayland/commit/?id=fb7e13021730d0a5516ecbd3712ea4235e05d24d This commit makes _gdk_wayland_display_open bail early if WAYLAND_DISPLAY is unset, just as it does for XDG_RUNTIME_DIR.
This commit is contained in:
parent
4a26366ff2
commit
35489f5d31
@ -431,13 +431,16 @@ _gdk_wayland_display_open (const gchar *display_name)
|
||||
|
||||
GDK_NOTE (MISC, g_message ("opening display %s", display_name ? display_name : ""));
|
||||
|
||||
/* If this variable is unset then wayland initialisation will surely
|
||||
/* If these variables are unset then wayland initialisation will surely
|
||||
* fail, logging a fatal error in the process. Save ourselves from
|
||||
* that.
|
||||
*/
|
||||
if (g_getenv ("XDG_RUNTIME_DIR") == NULL)
|
||||
return NULL;
|
||||
|
||||
if (g_getenv ("WAYLAND_DISPLAY") == NULL)
|
||||
return NULL;
|
||||
|
||||
wl_log_set_handler_client (log_handler);
|
||||
|
||||
wl_display = wl_display_connect (display_name);
|
||||
|
Loading…
Reference in New Issue
Block a user