aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/mozilla-embed-single.cpp
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-10-11 00:03:53 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-10-11 00:03:53 +0800
commitef0d06b1cca990d13d0f1e3e051248e795c4d79b (patch)
treec03d644960b6ae1863a8973a1cd1187d20a1db17 /embed/mozilla/mozilla-embed-single.cpp
parent840e12a02b3e26c0697b81af8bdfdb5398017fb8 (diff)
downloadgsoc2013-epiphany-ef0d06b1cca990d13d0f1e3e051248e795c4d79b.tar
gsoc2013-epiphany-ef0d06b1cca990d13d0f1e3e051248e795c4d79b.tar.gz
gsoc2013-epiphany-ef0d06b1cca990d13d0f1e3e051248e795c4d79b.tar.bz2
gsoc2013-epiphany-ef0d06b1cca990d13d0f1e3e051248e795c4d79b.tar.lz
gsoc2013-epiphany-ef0d06b1cca990d13d0f1e3e051248e795c4d79b.tar.xz
gsoc2013-epiphany-ef0d06b1cca990d13d0f1e3e051248e795c4d79b.tar.zst
gsoc2013-epiphany-ef0d06b1cca990d13d0f1e3e051248e795c4d79b.zip
reviewed by: Christian Persch <chpe@cvs.gnome.org>
2004-10-10 Marco Pesenti Gritti <marco@gnome.org> reviewed by: Christian Persch <chpe@cvs.gnome.org> * 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.
Diffstat (limited to 'embed/mozilla/mozilla-embed-single.cpp')
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 94f3123e3..756c3c4b5 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -627,6 +627,12 @@ impl_get_offline_mode (EphyEmbedSingle *shell)
}
static GList *
+impl_get_printer_list (EphyEmbedSingle *shell)
+{
+ return MozillaPrivate::GetPrinterList ();
+}
+
+static GList *
impl_get_font_list (EphyEmbedSingle *shell,
const char *langGroup)
{
@@ -958,7 +964,7 @@ impl_open_window (EphyEmbedSingle *single,
wWatch->OpenWindow (domWindow, address, name, features, nsnull,
getter_AddRefs (newWindow));
- return MozillaFindEmbed (newWindow);
+ return EphyUtils::FindEmbed (newWindow);
}
static void
@@ -983,6 +989,7 @@ ephy_embed_single_iface_init (EphyEmbedSingleIface *iface)
iface->get_offline_mode = impl_get_offline_mode;
iface->get_font_list = impl_get_font_list;
iface->open_window = impl_open_window;
+ iface->get_printer_list = impl_get_printer_list;
}
static void