From 6fceea28608be0fda32d94f59e1b1550774318a0 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Fri, 3 Oct 2014 14:05:09 +0000 Subject: Imported Upstream version 0.98 --- src/xsane-viewer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/xsane-viewer.c') diff --git a/src/xsane-viewer.c b/src/xsane-viewer.c index 9fcae69..6a58f8b 100644 --- a/src/xsane-viewer.c +++ b/src/xsane-viewer.c @@ -253,7 +253,6 @@ static void xsane_viewer_save_callback(GtkWidget *window, gpointer data) char *inputfilename; char windowname[256]; int output_format; - char *filetype = NULL; int abort = 0; char buf[256]; @@ -282,7 +281,7 @@ static void xsane_viewer_save_callback(GtkWidget *window, gpointer data) snprintf(windowname, sizeof(windowname), "%s %s %s", xsane.prog_name, WINDOW_VIEWER_OUTPUT_FILENAME, xsane.device_text); umask((mode_t) preferences.directory_umask); /* define new file permissions */ - abort = xsane_back_gtk_get_filename(windowname, outputfilename, sizeof(outputfilename), outputfilename, &filetype, TRUE, TRUE, FALSE, TRUE); + abort = xsane_back_gtk_get_filename(windowname, outputfilename, sizeof(outputfilename), outputfilename, &preferences.filetype, TRUE, TRUE, FALSE, TRUE); umask(XSANE_DEFAULT_UMASK); /* define new file permissions */ if (abort) @@ -321,7 +320,7 @@ static void xsane_viewer_save_callback(GtkWidget *window, gpointer data) inputfilename = strdup(v->filename); - output_format = xsane_identify_output_format(v->output_filename, filetype, 0); + output_format = xsane_identify_output_format(v->output_filename, preferences.filetype, 0); if ((!v->allow_reduction_to_lineart) && (output_format == XSANE_PNM)) /* save PNM but do not reduce to lineart (if lineart) */ { -- cgit v1.2.3