[vim] 25/139: patch 7.4.1713 Problem: GTK GUI doesn't work on Wayland. Solution: Specify that only the X11 backend is allowed. (Simon McVittie)

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit f80663f17b2f2499b45eb4467088704c8298c385
Author: Bram Moolenaar <Bram at vim.org>
Date:   Tue Apr 5 21:56:06 2016 +0200

    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 aa4137a..00196eb 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 91f02a5..f22af28 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1713,
+/**/
     1712,
 /**/
     1711,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git