Fix compilation error on Cygwin.

[pspp-builds.git] / src / ui / gui / psppire-output-window.c

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 986742d0f65e40b0a84e6d67a361e92a8ac8a67e..7b254b9540452666e6f39be6f19e7eba2086ca44 100644 (file)
--- 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);
     }
 
@@ -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);
 
@@ -296,7 +298,7 @@ reload_viewer (PsppireOutputWindow *ow)
   GtkTextIter end_iter;
   GtkTextMark *mark ;
 
-  static char *line = NULL;
+  char *line = NULL;
 
   gboolean chars_inserted = FALSE;
 
@@ -325,16 +327,16 @@ reload_viewer (PsppireOutputWindow *ow)
       }
 
     /* Delete all the entire buffer */
-    gtk_text_buffer_get_start_iter (ov->buffer, &start_iter);
-    gtk_text_buffer_delete (ov->buffer, &start_iter, &end_iter);
+    gtk_text_buffer_get_start_iter (ow->buffer, &start_iter);
+    gtk_text_buffer_delete (ow->buffer, &start_iter, &end_iter);
 
 
-    gtk_text_buffer_get_start_iter (ov->buffer, &start_iter);
+    gtk_text_buffer_get_start_iter (ow->buffer, &start_iter);
     /* Read in the next lot of text */
     while (fgets (line, viewer_width + 1, fp) != NULL)
       {
        chars_inserted = TRUE;
-       gtk_text_buffer_insert (ov->buffer, &start_iter, line, -1);
+       gtk_text_buffer_insert (ow->buffer, &start_iter, line, -1);
       }
 
     fclose (fp);