patch 8.0.0637: crash when using some version of GTK 3
Problem: Crash when using some version of GTK 3.
Solution: Add #ifdefs around incrementing the menu index. (Kazunobu
Kuriyama)
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index c175dd3..3406978 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -652,9 +652,11 @@
parent_widget = (parent != NULL) ? parent->submenu_id : gui.menubar;
menu_item_new(menu, parent_widget);
+# if !GTK_CHECK_VERSION(3,4,0)
/* since the tearoff should always appear first, increment idx */
if (parent != NULL && !menu_is_popup(parent->name))
++idx;
+# endif
gtk_menu_shell_insert(GTK_MENU_SHELL(parent_widget), menu->id, idx);
@@ -773,10 +775,12 @@
if (parent == NULL || parent->submenu_id == NULL)
return;
+# if !GTK_CHECK_VERSION(3,4,0)
/* Make place for the possible tearoff handle item. Not in the popup
* menu, it doesn't have a tearoff item. */
if (!menu_is_popup(parent->name))
++idx;
+# endif
if (menu_is_separator(menu->name))
{
diff --git a/src/version.c b/src/version.c
index 6d33f12..23653c1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 637,
+/**/
636,
/**/
635,