aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-06-25 21:38:36 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-06-25 21:38:36 +0800
commit4d95823df4166a6430bb07fc0701a8ab1c838a38 (patch)
treeba4960efe79b61e39d76b84a433cdfd183d6a75e
parent1e6c9597b2253ace1b921f1247164b7f7e1fa6f5 (diff)
downloadgsoc2013-epiphany-4d95823df4166a6430bb07fc0701a8ab1c838a38.tar
gsoc2013-epiphany-4d95823df4166a6430bb07fc0701a8ab1c838a38.tar.gz
gsoc2013-epiphany-4d95823df4166a6430bb07fc0701a8ab1c838a38.tar.bz2
gsoc2013-epiphany-4d95823df4166a6430bb07fc0701a8ab1c838a38.tar.lz
gsoc2013-epiphany-4d95823df4166a6430bb07fc0701a8ab1c838a38.tar.xz
gsoc2013-epiphany-4d95823df4166a6430bb07fc0701a8ab1c838a38.tar.zst
gsoc2013-epiphany-4d95823df4166a6430bb07fc0701a8ab1c838a38.zip
Remove preview flag
2004-06-25 Marco Pesenti Gritti <marco@gnome.org> * embed/MozillaPrivate.cpp: Remove preview flag
-rw-r--r--ChangeLog6
-rw-r--r--embed/ephy-embed.h1
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/MozillaPrivate.cpp5
-rw-r--r--embed/mozilla/MozillaPrivate.h3
-rw-r--r--embed/mozilla/PrintingPromptService.cpp2
-rwxr-xr-xembed/print-dialog.c1
7 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 626420dc6..1b33d7abc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-06-25 Marco Pesenti Gritti <marco@gnome.org>
+ * embed/MozillaPrivate.cpp:
+
+ Remove preview flag
+
+2004-06-25 Marco Pesenti Gritti <marco@gnome.org>
+
* embed/ephy-embed.c: (ephy_embed_print),
(ephy_embed_set_print_preview_mode):
* embed/ephy-embed.h:
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 831b16285..0e82f5545 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -86,7 +86,6 @@ typedef struct
int frame_type;
int orientation;
gboolean print_color;
- gboolean preview;
/*
* &T - title
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);
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 93cecdbc7..879cd21ee 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -208,7 +208,6 @@ ephy_print_get_print_info (void)
info->footer_center_string = g_strdup("");
info->frame_type = 0;
- info->preview = FALSE;
return info;
}