X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=b0eff950c7e5e6b466b70edda79e9faf40702a8b;hb=48d85ad2926b978fe73bd754a5baf626881e1915;hp=7f7d2765a78fbe46a65887105fbaa6777ae9ad61;hpb=55077868a3eb1776432bcb46a3627cc8e0ee54db;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 7f7d2765..b0eff950 100644
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -127,7 +127,7 @@ on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data)
 
   the_output_viewer = NULL;
 
-  unlink (OUTPUT_FILE_NAME);
+  unlink (output_file_name());
 
   return FALSE;
 }
@@ -278,7 +278,7 @@ psppire_output_window_reload (void)
   struct stat buf;
 
   /* If there is no output, then don't do anything */
-  if (0 != stat (OUTPUT_FILE_NAME, &buf))
+  if (0 != stat (output_file_name(), &buf))
     return ;
 
   if ( NULL == the_output_viewer )
@@ -298,7 +298,7 @@ reload_viewer (PsppireOutputWindow *ow)
   GtkTextIter end_iter;
   GtkTextMark *mark ;
 
-  static char *line = NULL;
+  char *line = NULL;
 
   gboolean chars_inserted = FALSE;
 
@@ -319,24 +319,24 @@ reload_viewer (PsppireOutputWindow *ow)
   */
   {
     GtkTextIter start_iter;
-    FILE *fp = fopen (OUTPUT_FILE_NAME, "r");
+    FILE *fp = fopen (output_file_name(), "r");
     if ( !fp)
       {
-	g_print ("Cannot open %s\n", OUTPUT_FILE_NAME);
+	g_critical ("Cannot open %s\n", output_file_name());
 	return;
       }
 
     /* 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);
@@ -345,10 +345,10 @@ reload_viewer (PsppireOutputWindow *ow)
   {
     if ( ow->fp == NULL)
       {
-	ow->fp = fopen (OUTPUT_FILE_NAME, "r");
+	ow->fp = fopen (output_file_name(), "r");
 	if ( ow->fp == NULL)
 	  {
-	    g_print ("Cannot open %s\n", OUTPUT_FILE_NAME);
+	    g_critical ("Cannot open %s\n", output_file_name());
 	    return;
 	  }
       }