Create "/Menus" in mainwindow's UI manager in mainwindow.c, not in summaryview.c.

diff --git a/src/mainwindow.c b/src/mainwindow.c
index e12732e1e5e5956430e3ab72024047461b2bc08a..53e81f1f804fe6e9778bf3aa753f403e2b11245b 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1884,6 +1884,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));
 
                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) {
        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
index 38c1c1ef43111a5e5a044651c9a02c0776eeb965..93d85f1a49c8fce86ad71d3f452888f60244642b 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -695,7 +695,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);
 
        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
        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