diff options
| -rw-r--r-- | src/gui_gtk.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c index ba2d23d1e..48537f449 100644 --- a/src/gui_gtk.c +++ b/src/gui_gtk.c @@ -613,6 +613,17 @@ gui_mch_menu_set_tip(vimmenu_T *menu) void gui_mch_destroy_menu(vimmenu_T *menu) { + /* Don't let gtk_container_remove automatically destroy menu->id. */ + if (menu->id != NULL) + g_object_ref(menu->id); + + /* Workaround for a spurious gtk warning in Ubuntu: "Trying to remove + * a child that doesn't believe we're it's parent." + * Remove widget from gui.menubar before destroying it. */ + if (menu->id != NULL && gui.menubar != NULL + && gtk_widget_get_parent(menu->id) == gui.menubar) + gtk_container_remove(GTK_CONTAINER(gui.menubar), menu->id); + # ifdef FEAT_TOOLBAR if (menu->parent != NULL && menu_is_toolbar(menu->parent->name)) { @@ -632,6 +643,8 @@ gui_mch_destroy_menu(vimmenu_T *menu) gtk_widget_destroy(menu->id); } + if (menu->id != NULL) + g_object_unref(menu->id); menu->submenu_id = NULL; menu->id = NULL; } diff --git a/src/version.c b/src/version.c index 4d14c4f73..33762fcb2 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1289, +/**/ 1288, /**/ 1287, |