From c6573cb04bdc216e7e5ea3657cb1186eaf0f1095 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Sun, 18 Jun 2006 18:52:03 +0000
Subject: 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.
---
 src/window-commands.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'src/window-commands.c')

diff --git a/src/window-commands.c b/src/window-commands.c
index ac845e637..051115db3 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -59,17 +59,32 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtkicontheme.h>
 #include <gtk/gtktoggleaction.h>
+#include <gtk/gtkprintoperation.h>
 #include <glib/gi18n.h>
 
+static void
+page_setup_done_cb (GtkPageSetup *setup,
+		    EphyEmbedShell *shell)
+{
+	if (setup != NULL)
+	{
+		ephy_embed_shell_set_page_setup (shell, setup);
+	}
+}
+
 void
 window_cmd_file_print_setup (GtkAction *action,
 			     EphyWindow *window)
 {
-	EphyDialog *dialog;
-
-	dialog = EPHY_DIALOG (ephy_shell_get_print_setup_dialog (ephy_shell));
+	EphyEmbedShell *shell;
 
-	ephy_dialog_show (dialog);
+	shell = ephy_embed_shell_get_default ();
+	gtk_print_run_page_setup_dialog_async
+		(GTK_WINDOW (window),
+		 ephy_embed_shell_get_page_setup (shell),
+		 ephy_embed_shell_get_print_settings (shell),
+		 page_setup_done_cb,
+		 shell);
 }
 
 void
-- 
cgit v1.2.3