X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=106b4ad0adcdf1ae5a9bc1eea5b045b026d61434;hb=bfe9a8d8fa8999f5119b05755495d1fb77543017;hp=d5e5044af87c7e338966964212b5f6639616c24d;hpb=7bc7a451768f00702e65a25d4a9bdd0b567f82ac;p=pspp

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index d5e5044af8..106b4ad0ad 100644
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -67,7 +67,7 @@ psppire_output_window_get_type (void)
       };
 
       psppire_output_window_type =
-	g_type_register_static (PSPPIRE_WINDOW_TYPE, "PsppireOutputWindow",
+	g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireOutputWindow",
 				&psppire_output_window_info, 0);
     }
 
@@ -208,7 +208,7 @@ psppire_output_window_init (PsppireOutputWindow *window)
 
   gtk_widget_show_all (box);
 
-  //  connect_help (xml);
+  connect_help (xml);
 
   window->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (window->textview));
 
@@ -232,25 +232,27 @@ psppire_output_window_init (PsppireOutputWindow *window)
 
   window->fp = NULL;
 
-  g_signal_connect (get_object_assert (xml,"help_about"),
+  g_signal_connect (get_action_assert (xml,"help_about"),
 		    "activate",
 		    G_CALLBACK (about_new),
 		    window);
 
-  g_signal_connect (get_object_assert (xml,"help_reference"),
+  g_signal_connect (get_action_assert (xml,"help_reference"),
 		    "activate",
 		    G_CALLBACK (reference_manual),
 		    NULL);
 
-  g_signal_connect (get_object_assert (xml,"windows_minimise-all"),
+  g_signal_connect (get_action_assert (xml,"windows_minimise-all"),
 		    "activate",
 		    G_CALLBACK (psppire_window_minimise_all),
 		    NULL);
 
-  GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1"));
+  {
+    GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
 
-  PSPPIRE_WINDOW (window)->menu =
-    GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar1/windows_menuitem/windows_minimise-all")->parent);
+    PSPPIRE_WINDOW (window)->menu =
+      GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar1/windows_menuitem/windows_minimise-all")->parent);
+  }
 
   g_object_unref (xml);
 
@@ -263,8 +265,8 @@ GtkWidget*
 psppire_output_window_new (void)
 {
   return GTK_WIDGET (g_object_new (psppire_output_window_get_type (),
-				   "usage", PSPPIRE_WINDOW_USAGE_OUTPUT,
 				   "filename", "Output",
+				   "description", _("Output Viewer"),
 				   NULL));
 }
 
@@ -296,7 +298,7 @@ reload_viewer (PsppireOutputWindow *ow)
   GtkTextIter end_iter;
   GtkTextMark *mark ;
 
-  static char *line = NULL;
+  char *line = NULL;
 
   gboolean chars_inserted = FALSE;