From 4a63f3304677cecf7d23943c90eac68bc2e2adf7 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Thu, 11 Oct 2007 10:45:50 +0000 Subject: Take the page orientation from the page setup, not from the print settings. Bug #485670 (see also gtk+ bug #485685). svn path=/trunk/; revision=7527 --- embed/mozilla/GeckoPrintService.cpp | 3 ++- embed/xulrunner/components/GeckoPrintService.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/embed/mozilla/GeckoPrintService.cpp b/embed/mozilla/GeckoPrintService.cpp index 71c5a6a6d..140864846 100644 --- a/embed/mozilla/GeckoPrintService.cpp +++ b/embed/mozilla/GeckoPrintService.cpp @@ -650,7 +650,8 @@ GeckoPrintService::TranslateSettings (GtkPrintSettings *aGtkSettings, gtk_print_settings_set_page_ranges (aGtkSettings, NULL, 0); gtk_print_settings_set_page_set (aGtkSettings, GTK_PAGE_SET_ALL); - switch (gtk_print_settings_get_orientation (aGtkSettings)) { + /* We must use the page setup here instead of the print settings, see gtk bug #485685 */ + switch (gtk_page_setup_get_orientation (aPageSetup)) { case GTK_PAGE_ORIENTATION_PORTRAIT: case GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT: /* not supported */ aSettings->SetOrientation (nsIPrintSettings::kPortraitOrientation); diff --git a/embed/xulrunner/components/GeckoPrintService.cpp b/embed/xulrunner/components/GeckoPrintService.cpp index b1d34a960..ceab26809 100644 --- a/embed/xulrunner/components/GeckoPrintService.cpp +++ b/embed/xulrunner/components/GeckoPrintService.cpp @@ -646,7 +646,8 @@ GeckoPrintService::TranslateSettings (GtkPrintSettings *aGtkSettings, gtk_print_settings_set_page_ranges (aGtkSettings, NULL, 0); gtk_print_settings_set_page_set (aGtkSettings, GTK_PAGE_SET_ALL); - switch (gtk_print_settings_get_orientation (aGtkSettings)) { + /* We must use the page setup here instead of the print settings, see gtk bug #485685 */ + switch (gtk_page_setup_get_orientation (aPageSetup)) { case GTK_PAGE_ORIENTATION_PORTRAIT: case GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT: /* not supported */ aSettings->SetOrientation (nsIPrintSettings::kPortraitOrientation); -- cgit v1.2.3