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=7b254b9540452666e6f39be6f19e7eba2086ca44;hpb=14aac9fe7a7efbb6c9bded2ed5969a643cb76645;p=pspp-builds.git diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index 7b254b95..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 ) @@ -319,10 +319,10 @@ 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; } @@ -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; } }