From f80663f17b2f2499b45eb4467088704c8298c385 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 5 Apr 2016 21:56:06 +0200 Subject: [PATCH] patch 7.4.1713 Problem: GTK GUI doesn't work on Wayland. Solution: Specify that only the X11 backend is allowed. (Simon McVittie) --- src/gui_gtk_x11.c | 6 ++++++ src/version.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index aa4137ac5..00196ebe8 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -1679,6 +1679,12 @@ gui_mch_init_check(void) } #endif +#if GTK_CHECK_VERSION(3,10,0) + /* Vim currently assumes that Gtk means X11, so it cannot use native Gtk + * support for other backends such as Wayland. */ + gdk_set_allowed_backends ("x11"); +#endif + #ifdef FEAT_GUI_GNOME if (gtk_socket_id == 0) using_gnome = 1; diff --git a/src/version.c b/src/version.c index 91f02a5b8..f22af28dc 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1713, /**/ 1712, /**/ -- 2.40.0