aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/mozilla-embed.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'embed/mozilla/mozilla-embed.cpp')
-rw-r--r--embed/mozilla/mozilla-embed.cpp32
1 files changed, 6 insertions, 26 deletions
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 5d7e30bc8..cdbd4ea8c 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -683,39 +683,19 @@ impl_get_security_level (EphyEmbed *embed,
}
static void
-impl_print (EphyEmbed *embed,
- EmbedPrintInfo *info)
+impl_print (EphyEmbed *embed)
{
MozillaEmbedPrivate *mpriv = MOZILLA_EMBED(embed)->priv;
- nsresult result;
-
- nsCOMPtr<nsIPrintSettings> options;
- result = mpriv->browser->GetPrintSettings(getter_AddRefs(options));
- if (NS_FAILED (result) || !options) return;
-
- /* work around mozilla bug which borks when printing selection without having one */
- if (info->pages == 2 && ephy_command_manager_can_do_command
- (EPHY_COMMAND_MANAGER (embed), "cmd_copy") == FALSE)
- {
- info->pages = 0;
- }
-
- MozillaCollatePrintSettings(info, options);
-
- options->SetPrintSilent (PR_TRUE);
-
- result = mpriv->browser->Print(options, info->preview);
-
- /* Workaround for bug 125984 */
- options->SetPrintSilent (PR_FALSE);
+
+ mpriv->browser->Print ();
}
static void
-impl_print_preview_close (EphyEmbed *embed)
+impl_set_print_preview_mode (EphyEmbed *embed, gboolean preview_mode)
{
MozillaEmbedPrivate *mpriv = MOZILLA_EMBED(embed)->priv;
- mpriv->browser->PrintPreviewClose();
+ mpriv->browser->SetPrintPreviewMode (preview_mode);
}
static int
@@ -1203,7 +1183,7 @@ ephy_embed_iface_init (EphyEmbedIface *iface)
iface->get_encoding = impl_get_encoding;
iface->has_automatic_encoding = impl_has_automatic_encoding;
iface->print = impl_print;
- iface->print_preview_close = impl_print_preview_close;
+ iface->set_print_preview_mode = impl_set_print_preview_mode;
iface->print_preview_n_pages = impl_print_preview_n_pages;
iface->print_preview_navigate = impl_print_preview_navigate;
iface->has_modified_forms = impl_has_modified_forms;