Make print and print setup go trough nsIPrintingPromptService (backported

2004-07-10  Christian Persch  <chpe@cvs.gnome.org>

	* configure.in:
	* data/glade/print.glade:
	* embed/ephy-embed-single.c: (ephy_embed_single_print_setup):
	* embed/ephy-embed-single.h:
	* embed/ephy-embed.c: (ephy_embed_print),
	(ephy_embed_set_print_preview_mode):
	* embed/ephy-embed.h:
	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EphyBrowser.h:
	* 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_get_print_info),
	(ephy_print_dialog_response_cb),
	(ephy_print_setup_dialog_help_button_cb), (ephy_print_dialog_new):
	* embed/print-dialog.h:
	* src/ephy-shell.c: (ephy_shell_init), (ephy_shell_finalize),
	(ephy_shell_get_prefs_dialog):
	* src/ephy-shell.h:
	* src/ephy-window.c: (ephy_window_delete_event_cb),
	(ephy_window_finalize), (update_embed_dialogs), (ephy_window_find):
	* src/ppview-toolbar.c: (toolbar_cmd_ppv_close):
	* src/window-commands.c: (window_cmd_file_print_setup),
	(window_cmd_file_print_preview), (window_cmd_file_print):

	Make print and print setup go trough nsIPrintingPromptService
	(backported from HEAD).

1 files changed, 3 insertions, 42 deletions

diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index a18728faa..b9de37e7b 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -131,8 +131,6 @@ void ephy_print_dialog_response_cb		(GtkWidget *widget,
 						 EphyDialog *dialog);
 void ephy_print_dialog_browse_button_cb		(GtkWidget *widget,
 						 EphyDialog *dialog);
-void ephy_print_setup_dialog_close_button_cb	(GtkWidget *widget,
-						 EphyDialog *dialog);
 void ephy_print_setup_dialog_help_button_cb	(GtkWidget *widget,
 						 EphyDialog *dialog);
 
@@ -200,7 +198,6 @@ ephy_print_get_print_info (void)
 	info->footer_center_string = g_strdup("");
 
 	info->frame_type = 0;
-	info->preview = FALSE;
 
 	return info;
 }
@@ -210,39 +207,14 @@ ephy_print_dialog_response_cb (GtkWidget *widget,
 			       int response,
 			       EphyDialog *dialog)
 {
-	EphyEmbed *embed;
-	EmbedPrintInfo *info;
-	gboolean only_collect_info;
-
-	only_collect_info = GPOINTER_TO_INT
-		(g_object_get_data (G_OBJECT (dialog), "only-collect-info"));
-
-	if (only_collect_info)
-	{
-		return;
-	}
-
 	switch (response)
 	{
-		case GTK_RESPONSE_OK:
-			info = ephy_print_get_print_info ();
-	
-			embed = ephy_embed_dialog_get_embed (EPHY_EMBED_DIALOG (dialog));
-			g_return_if_fail (EPHY_IS_EMBED (embed));
-	
-			ephy_embed_print (embed, info);
-	
-			ephy_print_info_free (info);
-
-			break;
 		case GTK_RESPONSE_HELP:
 			ephy_gui_help (GTK_WINDOW (widget), "epiphany", "to-print-page");
 			return;
 		default:
 			break;
 	}
-
-	g_object_unref (dialog);
 }
 
 static void
@@ -295,23 +267,15 @@ ephy_print_dialog_browse_button_cb (GtkWidget *widget,
 }
 
 void
-ephy_print_setup_dialog_close_button_cb (GtkWidget *widget,
-					 EphyDialog *dialog)
-{
-	g_object_unref (dialog);
-}
-
-void
 ephy_print_setup_dialog_help_button_cb (GtkWidget *widget,
-					 EphyDialog *dialog)
+					EphyDialog *dialog)
 {
-	ephy_gui_help (GTK_WINDOW (dialog), "epiphany", "using-print-setup");
+	ephy_gui_help (GTK_WINDOW (widget), "epiphany", "using-print-setup");
 }
 
 EphyDialog *
 ephy_print_dialog_new (GtkWidget *parent,
-		       EphyEmbed *embed,
-		       gboolean only_collect_info)
+		       EphyEmbed *embed)
 {
 	EphyDialog *dialog;
 	GtkWidget *window, *button;
@@ -343,9 +307,6 @@ ephy_print_dialog_new (GtkWidget *parent,
 	button = ephy_dialog_get_control (dialog, print_props[BROWSE_PROP].id);
 	gtk_widget_set_sensitive (button, eel_gconf_key_is_writable (CONF_PRINT_FILE));
 
-	g_object_set_data (G_OBJECT (dialog), "only-collect-info",
-			   GINT_TO_POINTER (only_collect_info));
-
 	return dialog;
 }