Pull the search UI construction code out into a distinct function.

[geeqie.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index c81b888..539ce64 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,19 +1,29 @@
 /*
- * Geeqie
- * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
  * Author: John Ellis
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "main.h"
 #include "print.h"
 
 #include "filedata.h"
+#include "filefilter.h"
 #include "image.h"
 #include "image-load.h"
 #include "pixbuf_util.h"
@@ -1367,10 +1377,10 @@ static gboolean print_job_ps_page_text(PrintWindow *pw, const gchar *text, gdoub
        pixbuf_draw_layout(pixbuf, layout, pw->dialog->dialog, 0, 0, r, g, b, 255);
        g_object_unref(G_OBJECT(layout));
 
-       ret = print_job_ps_page_image(pw, pixbuf, x, y, 
+       ret = print_job_ps_page_image(pw, pixbuf, x, y,
                                       /* do not allow rescaling of the pixbuf due to rounding errors */
                                      ((gdouble)lw + 0.01) / scale_to_max_dpi,
-                                     ((gdouble)lh + 0.01) / scale_to_max_dpi, 
+                                     ((gdouble)lh + 0.01) / scale_to_max_dpi,
                                      0, 0);
 
        g_object_unref(G_OBJECT(pixbuf));
@@ -1440,7 +1450,7 @@ static gboolean print_job_rgb_page_new(PrintWindow *pw, gint page)
                const gchar *ext;
                gchar *base;
 
-               ext = extension_from_path(pw->output_path);
+               ext = registered_extension_from_path(pw->output_path);
 
                if (ext)
                        {
@@ -3304,9 +3314,9 @@ void print_window_new(FileData *fd, GList *selection, GList *list, GtkWidget *pa
 
        pw->source = print_pref_int(PRINT_PREF_SOURCE, PRINT_SOURCE_SELECTION);
        pw->layout = print_pref_int(PRINT_PREF_LAYOUT, PRINT_LAYOUT_IMAGE);
-       
+
        pw->image_scale = print_pref_double(PRINT_PREF_IMAGE_SCALE, 100.0);
-       
+
        pw->output = print_pref_int(PRINT_PREF_OUTPUT, PRINT_OUTPUT_PS_LPR);
        pw->output_format = print_pref_int(PRINT_PREF_FORMAT, PRINT_FILE_JPG_NORMAL);