From ef0d06b1cca990d13d0f1e3e051248e795c4d79b Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 10 Oct 2004 16:03:53 +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/PrintingPromptService.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'embed/mozilla/PrintingPromptService.cpp') diff --git a/embed/mozilla/PrintingPromptService.cpp b/embed/mozilla/PrintingPromptService.cpp index 3eb4886ec..05138e86d 100644 --- a/embed/mozilla/PrintingPromptService.cpp +++ b/embed/mozilla/PrintingPromptService.cpp @@ -30,7 +30,7 @@ #include "print-dialog.h" #include "ephy-embed.h" #include "ephy-command-manager.h" -#include "MozillaPrivate.h" +#include "EphyUtils.h" #include "PrintingPromptService.h" #include "eel-gconf-extensions.h" #include "ephy-prefs.h" @@ -63,13 +63,13 @@ NS_IMETHODIMP GPrintingPromptService::ShowPrintDialog(nsIDOMWindow *parent, nsIW return NS_ERROR_ABORT; } - EphyEmbed *embed = EPHY_EMBED (MozillaFindEmbed (parent)); + EphyEmbed *embed = EPHY_EMBED (EphyUtils::FindEmbed (parent)); NS_ENSURE_TRUE (embed, NS_ERROR_FAILURE); if (!(eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_PRINT_SETUP) || eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_COMMAND_LINE))) { - GtkWidget *gtkParent = MozillaFindGtkParent(parent); + GtkWidget *gtkParent = EphyUtils::FindGtkParent(parent); NS_ENSURE_TRUE (gtkParent, NS_ERROR_FAILURE); dialog = ephy_print_dialog_new (gtkParent, embed); @@ -96,7 +96,7 @@ NS_IMETHODIMP GPrintingPromptService::ShowPrintDialog(nsIDOMWindow *parent, nsIW info->pages = 0; } - MozillaCollatePrintSettings (info, printSettings, FALSE); + EphyUtils::CollatePrintSettings (info, printSettings, FALSE); ephy_print_info_free (info); -- cgit v1.2.3