X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=5c5610a0e8cd398551a6d8b292b9df64f9898758;hb=e4ef4d0f708651807d91bd92d7ab92c1b5c6d675;hp=2e02b4e5ec33503f8ffc08d63676bc64e6d8d30b;hpb=0a3d7e00f93cd13ef478a8456eb25afa34dcb427;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 2e02b4e5..5c5610a0 100644
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -32,7 +32,7 @@
 #include <output/tab.h>
 #include <stdlib.h>
 
-#include "about.h"
+#include "help-menu.h"
 
 #include "psppire-output-window.h"
 
@@ -570,16 +570,6 @@ psppire_output_window_init (PsppireOutputWindow *window)
 		    G_CALLBACK (cancel_urgency),
 		    NULL);
 
-  g_signal_connect (get_action_assert (xml,"help_about"),
-		    "activate",
-		    G_CALLBACK (about_new),
-		    window);
-
-  g_signal_connect (get_action_assert (xml,"help_reference"),
-		    "activate",
-		    G_CALLBACK (reference_manual),
-		    NULL);
-
   g_signal_connect (get_action_assert (xml,"windows_minimise-all"),
 		    "activate",
 		    G_CALLBACK (psppire_window_minimise_all),
@@ -587,9 +577,10 @@ psppire_output_window_init (PsppireOutputWindow *window)
 
   {
     GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
+    merge_help_menu (uim);
 
     PSPPIRE_WINDOW (window)->menu =
-      GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar1/windows_menuitem/windows_minimise-all")->parent);
+      GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows_menuitem/windows_minimise-all")->parent);
   }
 
   g_signal_connect_swapped (get_action_assert (xml, "file_export"), "activate",