A embed/mozilla/GeckoPrintService.cpp: A

2006-06-18  Christian Persch  <chpe@cvs.gnome.org>

	* configure.ac:
	* data/default-prefs-common.js:
	* embed/Makefile.am:
	* embed/ephy-embed-shell.c: (ephy_embed_shell_dispose),
	(ephy_embed_shell_set_page_setup),
	(ephy_embed_shell_get_page_setup),
	(ephy_embed_shell_set_print_settings),
	(ephy_embed_shell_get_print_settings):
	* embed/ephy-embed-shell.h:
	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EphyBrowser.h:
	* embed/mozilla/EphyUtils.cpp:
	* embed/mozilla/EphyUtils.h:
	* embed/mozilla/Makefile.am:
	A embed/mozilla/GeckoPrintService.cpp:
	A embed/mozilla/GeckoPrintService.h:
	A embed/mozilla/GeckoPrintSession.cpp:
	A embed/mozilla/GeckoPrintSession.h:
	* embed/mozilla/MozRegisterComponents.cpp:
	R embed/mozilla/PrintingPromptService.cpp:
	R embed/mozilla/PrintingPromptService.h:
	* embed/mozilla/mozilla-embed-single.cpp:
	R embed/print-dialog.c:
	R embed/print-dialog.h:
	* src/ephy-shell.c: (ephy_shell_dispose),
	(ephy_shell_get_prefs_dialog):
	* src/ephy-shell.h:
	* src/epiphany.defs:
	* src/window-commands.c: (page_setup_done_cb),
	(window_cmd_file_print_setup):

	Drop libgnomeprint[ui] and use gtk printing.

1 files changed, 6 insertions, 5 deletions

diff --git a/embed/mozilla/EphyUtils.h b/embed/mozilla/EphyUtils.h
index cc607a9f9..c19ae088f 100644
--- a/embed/mozilla/EphyUtils.h
+++ b/embed/mozilla/EphyUtils.h
@@ -35,9 +35,7 @@ class nsAString;
 class nsIDOMWindow;
 class nsIFile;
 class nsIIOService;
-class nsIPrintSettings;
 class nsIURI;
-struct _EmbedPrintInfo;
 
 namespace EphyUtils
 {
@@ -59,10 +57,13 @@ namespace EphyUtils
 	GtkWidget      *FindEmbed		(nsIDOMWindow *aDOMWindow);
 
 	GtkWidget      *FindGtkParent		(nsIDOMWindow *aDOMWindow);
+	
+	char *		ConvertUTF16toUTF8	(const PRUnichar*, PRInt32);
+}
 
-	nsresult        CollatePrintSettings	(_EmbedPrintInfo *info,
-						 nsIPrintSettings *settings,
-						 gboolean preview);
+namespace EphyJSUtils
+{
+	PRBool IsCalledFromScript ();
 }
 
 #endif