commit b8ae498a690b3b2acd44a100e7fff745e0738b58
parent 96209c0115b54d3c94f4dcb7ea11a2f50c646b72
Author: Andrej Kacian <ticho@claws-mail.org>
Date: Sat, 1 Dec 2018 10:32:00 +0100
Create "/Menus" in mainwindow's UI manager in mainwindow.c, not in summaryview.c.
Diffstat:
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -1880,6 +1880,10 @@ MainWindow *main_window_create()
gtk_widget_hide(menubar);
gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(mainwin->ui_manager));
+ /* Create a menu container for the different popup menus we
+ * will be adding from other UI elements. */
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menus", "Menus", GTK_UI_MANAGER_MENUBAR)
+
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
if (prefs_common.toolbar_detachable) {
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -692,7 +692,6 @@ SummaryView *summary_create(MainWindow *mainwin)
summaryview->action_group = cm_menu_create_action_group_full(summaryview->ui_manager,"Menu", summary_popup_entries,
G_N_ELEMENTS(summary_popup_entries), (gpointer)summaryview);
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menus", "Menus", GTK_UI_MANAGER_MENUBAR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus", "SummaryViewPopup", "SummaryViewPopup", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Reply", "SummaryViewPopup/Reply", GTK_UI_MANAGER_MENUITEM)
#ifndef GENERIC_UMPC