From 96f1c46c7fdd0f85636bd30d3c7de89eccddabeb Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 10 Oct 2004 16:18:26 +0000 Subject: reviewed by: Christian Persch 2004-10-10 Marco Pesenti Gritti reviewed by: Christian Persch * data/glade/print.glade: * embed/ephy-embed-single.c: (ephy_embed_single_get_printer_list): * embed/ephy-embed-single.h: * embed/mozilla/ContentHandler.cpp: * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EphyHeaderSniffer.cpp: * embed/mozilla/EphyUtils.cpp: * embed/mozilla/EphyUtils.h: * embed/mozilla/FilePicker.cpp: * embed/mozilla/GtkNSSClientAuthDialogs.cpp: * embed/mozilla/GtkNSSDialogs.cpp: * embed/mozilla/GtkNSSKeyPairDialogs.cpp: * embed/mozilla/MozillaPrivate.cpp: * embed/mozilla/MozillaPrivate.h: * embed/mozilla/PrintingPromptService.cpp: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-embed.cpp: * embed/print-dialog.c: (ephy_print_dialog_new): * lib/ephy-dialog.c: (set_combo_box_from_value): Move current MozillaPrivate helpers to EphyUtils. Use MozillaPrivate for stuff that needs mozilla internal strings. Support multiple printers in the print dialog. This is actually a bug fix because on several distributions using hardcoded Poscript/default will simply not work at all. --- embed/mozilla/EphyBrowser.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'embed/mozilla/EphyBrowser.cpp') diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp index 655c3b110..040b7615f 100644 --- a/embed/mozilla/EphyBrowser.cpp +++ b/embed/mozilla/EphyBrowser.cpp @@ -26,7 +26,6 @@ #include "EphyBrowser.h" #include "EphyUtils.h" -#include "MozillaPrivate.h" #include "ephy-embed.h" #include "ephy-string.h" #include "ephy-debug.h" @@ -330,7 +329,7 @@ nsresult EphyBrowser::SetPrintPreviewMode (PRBool previewMode) print->GetGlobalPrintSettings (getter_AddRefs(settings)); info = ephy_print_get_print_info (); - MozillaCollatePrintSettings (info, settings, TRUE); + EphyUtils::CollatePrintSettings (info, settings, TRUE); ephy_print_info_free (info); rv = print->PrintPreview (nsnull, mDOMWindow, nsnull); -- cgit v1.2.3