projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New function check_interactions to specify all possible interactions
[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 106b4ad0adcdf1ae5a9bc1eea5b045b026d61434..b0eff950c7e5e6b466b70edda79e9faf40702a8b 100644
(file)
--- 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;
the_output_viewer = NULL;
- unlink (
OUTPUT_FILE_NAME
);
+ unlink (
output_file_name()
);
return FALSE;
}
return FALSE;
}
@@
-278,7
+278,7
@@
psppire_output_window_reload (void)
struct stat buf;
/* If there is no output, then don't do anything */
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 )
return ;
if ( NULL == the_output_viewer )
@@
-319,24
+319,24
@@
reload_viewer (PsppireOutputWindow *ow)
*/
{
GtkTextIter start_iter;
*/
{
GtkTextIter start_iter;
- FILE *fp = fopen (
OUTPUT_FILE_NAME
, "r");
+ FILE *fp = fopen (
output_file_name()
, "r");
if ( !fp)
{
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 */
return;
}
/* Delete all the entire buffer */
- gtk_text_buffer_get_start_iter (o
v
->buffer, &start_iter);
- gtk_text_buffer_delete (o
v
->buffer, &start_iter, &end_iter);
+ gtk_text_buffer_get_start_iter (o
w
->buffer, &start_iter);
+ gtk_text_buffer_delete (o
w
->buffer, &start_iter, &end_iter);
- gtk_text_buffer_get_start_iter (o
v
->buffer, &start_iter);
+ gtk_text_buffer_get_start_iter (o
w
->buffer, &start_iter);
/* Read in the next lot of text */
while (fgets (line, viewer_width + 1, fp) != NULL)
{
chars_inserted = TRUE;
/* Read in the next lot of text */
while (fgets (line, viewer_width + 1, fp) != NULL)
{
chars_inserted = TRUE;
- gtk_text_buffer_insert (o
v
->buffer, &start_iter, line, -1);
+ gtk_text_buffer_insert (o
w
->buffer, &start_iter, line, -1);
}
fclose (fp);
}
fclose (fp);
@@
-345,10
+345,10
@@
reload_viewer (PsppireOutputWindow *ow)
{
if ( ow->fp == NULL)
{
{
if ( ow->fp == NULL)
{
- ow->fp = fopen (
OUTPUT_FILE_NAME
, "r");
+ ow->fp = fopen (
output_file_name()
, "r");
if ( ow->fp == NULL)
{
if ( ow->fp == NULL)
{
- g_
print ("Cannot open %s\n", OUTPUT_FILE_NAME
);
+ g_
critical ("Cannot open %s\n", output_file_name()
);
return;
}
}
return;
}
}