diff options
Diffstat (limited to 'embed/mozilla')
| -rw-r--r-- | embed/mozilla/EphyBrowser.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/MozillaPrivate.cpp | 5 | ||||
| -rw-r--r-- | embed/mozilla/MozillaPrivate.h | 3 | ||||
| -rw-r--r-- | embed/mozilla/PrintingPromptService.cpp | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp index b9db2c2a0..7e500f431 100644 --- a/embed/mozilla/EphyBrowser.cpp +++ b/embed/mozilla/EphyBrowser.cpp @@ -340,7 +340,7 @@ nsresult EphyBrowser::SetPrintPreviewMode (PRBool previewMode) print->GetGlobalPrintSettings (getter_AddRefs(settings)); info = ephy_print_get_print_info (); - MozillaCollatePrintSettings (info, settings); + MozillaCollatePrintSettings (info, settings, TRUE); ephy_print_info_free (info); rv = print->PrintPreview (nsnull, mDOMWindow, nsnull); diff --git a/embed/mozilla/MozillaPrivate.cpp b/embed/mozilla/MozillaPrivate.cpp index 3fd0e57ab..c19f96919 100644 --- a/embed/mozilla/MozillaPrivate.cpp +++ b/embed/mozilla/MozillaPrivate.cpp @@ -75,7 +75,8 @@ GtkWidget *MozillaFindGtkParent (nsIDOMWindow *aDOMWindow) #define MM_TO_INCH(x) (((double) x) / 25.4) NS_METHOD MozillaCollatePrintSettings (const EmbedPrintInfo *info, - nsIPrintSettings *options) + nsIPrintSettings *options, + gboolean preview) { const static int frame_types[] = { nsIPrintSettings::kFramesAsIs, @@ -149,7 +150,7 @@ NS_METHOD MozillaCollatePrintSettings (const EmbedPrintInfo *info, * in print preview mode if we set "print to file" to true. * See epiphany bug #119818. */ - if (info->preview) + if (preview) { options->SetPrintToFile (PR_FALSE); } diff --git a/embed/mozilla/MozillaPrivate.h b/embed/mozilla/MozillaPrivate.h index 525902b16..498461421 100644 --- a/embed/mozilla/MozillaPrivate.h +++ b/embed/mozilla/MozillaPrivate.h @@ -27,4 +27,5 @@ GtkWidget *MozillaFindEmbed (nsIDOMWindow *aDOMWindow); GtkWidget *MozillaFindGtkParent (nsIDOMWindow *aDOMWindow); NS_METHOD MozillaCollatePrintSettings (const EmbedPrintInfo *info, - nsIPrintSettings *settings); + nsIPrintSettings *settings, + gboolean preview); diff --git a/embed/mozilla/PrintingPromptService.cpp b/embed/mozilla/PrintingPromptService.cpp index e69f35ed8..03b831f50 100644 --- a/embed/mozilla/PrintingPromptService.cpp +++ b/embed/mozilla/PrintingPromptService.cpp @@ -95,7 +95,7 @@ NS_IMETHODIMP GPrintingPromptService::ShowPrintDialog(nsIDOMWindow *parent, nsIW info->pages = 0; } - MozillaCollatePrintSettings (info, printSettings); + MozillaCollatePrintSettings (info, printSettings, FALSE); ephy_print_info_free (info); |