diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2007-09-01 17:35:44 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2007-09-01 17:35:44 (GMT) |
| commit | 153e65ad1a0382ffaf43cee43a158c020121969b (patch) | |
| tree | a0b8efafbe848377fe15cccd1c9e78520a176008 /shell | |
| parent | 982600bbceb76a22d5c7b3e0cbe6e20421105ad6 (diff) | |
Actually fix printing regressions. Remove orientation from EvPrintContext
2007-09-01 Carlos Garcia Campos <carlosgc@gnome.org>
* backend/pdf/ev-poppler.cc: (pdf_document_file_exporter_begin),
(pdf_document_file_exporter_do_page):
* libdocument/ev-file-exporter.h:
* shell/ev-jobs.[ch]: (ev_job_print_new), (ev_job_print_run):
* shell/ev-window.c: (ev_window_print_dialog_response_cb):
Actually fix printing regressions. Remove orientation from
EvPrintContext since it's redundant.
svn path=/trunk/; revision=2649
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ev-jobs.c | 4 | ||||
| -rw-r--r-- | shell/ev-jobs.h | 3 | ||||
| -rw-r--r-- | shell/ev-window.c | 13 |
3 files changed, 1 insertions, 19 deletions
diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c index 99bfc87..acd4cb3 100644 --- a/shell/ev-jobs.c +++ b/shell/ev-jobs.c @@ -4,6 +4,7 @@ #include "ev-document-links.h" #include "ev-document-images.h" #include "ev-document-forms.h" +#include "ev-file-exporter.h" #include "ev-document-factory.h" #include "ev-document-misc.h" #include "ev-file-helpers.h" @@ -565,7 +566,6 @@ ev_job_print_new (EvDocument *document, const gchar *format, gdouble width, gdouble height, - EvFileExporterOrientation orientation, EvPrintRange *ranges, gint n_ranges, EvPrintPageSet page_set, @@ -587,7 +587,6 @@ ev_job_print_new (EvDocument *document, job->width = width; job->height = height; - job->orientation = orientation; job->ranges = ranges; job->n_ranges = n_ranges; @@ -721,7 +720,6 @@ ev_job_print_run (EvJobPrint *job) fc.last_page = MAX (first_page, last_page); fc.paper_width = job->width; fc.paper_height = job->height; - fc.orientation = job->orientation; fc.duplex = FALSE; fc.pages_per_sheet = MAX (1, job->pages_per_sheet); diff --git a/shell/ev-jobs.h b/shell/ev-jobs.h index 6d7e95b..084ed6c 100644 --- a/shell/ev-jobs.h +++ b/shell/ev-jobs.h @@ -23,7 +23,6 @@ #include <gtk/gtk.h> #include "ev-document.h" #include "ev-window.h" -#include "ev-file-exporter.h" #include "ev-selection.h" G_BEGIN_DECLS @@ -207,7 +206,6 @@ struct _EvJobPrint gboolean reverse; gdouble width; gdouble height; - EvFileExporterOrientation orientation; }; struct _EvJobPrintClass @@ -267,7 +265,6 @@ EvJob *ev_job_print_new (EvDocument *document, const gchar *format, gdouble width, gdouble height, - EvFileExporterOrientation orientation, EvPrintRange *ranges, gint n_ranges, EvPrintPageSet page_set, diff --git a/shell/ev-window.c b/shell/ev-window.c index 81b303f..af2fb2a 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -2332,7 +2332,6 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog, gdouble width; gdouble height; GtkPrintPages print_pages; - EvFileExporterOrientation orientation = EV_FILE_EXPORTER_PORTRAIT; const gchar *file_format; if (response == GTK_RESPONSE_CANCEL) { @@ -2412,17 +2411,6 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog, height = gtk_page_setup_get_paper_height (window->priv->print_page_setup, GTK_UNIT_PIXEL); - switch (gtk_page_setup_get_orientation (window->priv->print_page_setup)) { - case GTK_PAGE_ORIENTATION_PORTRAIT: - case GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT: - orientation = EV_FILE_EXPORTER_PORTRAIT; - break; - case GTK_PAGE_ORIENTATION_LANDSCAPE: - case GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE: - orientation = EV_FILE_EXPORTER_LANDSCAPE; - break; - } - if (scale != 1.0) { width *= scale; height *= scale; @@ -2437,7 +2425,6 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog, window->priv->print_job = ev_job_print_new (window->priv->document, file_format ? file_format : "ps", width, height, - orientation, ranges, n_ranges, page_set, pages_per_sheet, |