[vim] 120/139: patch 7.4.1803 Problem: GTK3 doesn't handle menu separaters properly. Solution: Use gtk_separator_menu_item_new(). (Kazunobu Kuriyama)

[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 0b6cf69c038b9af198542edc349ebe8e53a8f847
Author: Bram Moolenaar <Bram at vim.org>
Date:   Sat Apr 30 13:26:14 2016 +0200

    patch 7.4.1803
    Problem:    GTK3 doesn't handle menu separaters properly.
    Solution:   Use gtk_separator_menu_item_new(). (Kazunobu Kuriyama)
---
 src/gui_gtk.c | 4 ++++
 src/version.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 55d1000..81320dd 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -781,8 +781,12 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx)
 	if (menu_is_separator(menu->name))
 	{
 	    /* Separator: Just add it */
+# if GTK_CHECK_VERSION(3,0,0)
+	    menu->id = gtk_separator_menu_item_new();
+# else
 	    menu->id = gtk_menu_item_new();
 	    gtk_widget_set_sensitive(menu->id, FALSE);
+# endif
 	    gtk_widget_show(menu->id);
 # if GTK_CHECK_VERSION(3,0,0)
 	    gtk_menu_shell_insert(GTK_MENU_SHELL(parent->submenu_id),
diff --git a/src/version.c b/src/version.c
index fc31642..ff275cf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1803,
+/**/
     1802,
 /**/
     1801,

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