From 36ad80414746a470d3f64849266817c58fef2344 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@gnome.org>
Date: Fri, 25 Jun 2004 11:31:22 +0000
Subject: Simplify print code. Now there is only one case to deal with, the
 mozilla

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:
        * embed/mozilla/EphyBrowser.cpp:
        * embed/mozilla/EphyBrowser.h:
        * embed/mozilla/PrintingPromptService.cpp:
        * embed/mozilla/mozilla-embed.cpp:
        * embed/print-dialog.c: (ephy_print_dialog_response_cb),
        (ephy_print_dialog_new):
        * embed/print-dialog.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_preview),
        (window_cmd_file_print):

        Simplify print code. Now there is only one case to deal with,
        the mozilla prompt dialog.
        This should help with xprint.
---
 embed/print-dialog.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'embed/print-dialog.c')

diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 6e4b46e2c..93cecdbc7 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -218,39 +218,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
@@ -326,8 +301,7 @@ ephy_print_setup_dialog_help_button_cb (GtkWidget *widget,
 
 EphyDialog *
 ephy_print_dialog_new (GtkWidget *parent,
-		       EphyEmbed *embed,
-		       gboolean only_collect_info)
+		       EphyEmbed *embed)
 {
 	EphyDialog *dialog;
 	GtkWidget *window, *button;
@@ -359,9 +333,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;
 }
 
-- 
cgit v1.2.3