Don't unref the print dialogue twice when shown from mozilla.

2003-11-02  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/PrintingPromptService.cpp:
	* embed/print-dialog.c: (print_dialog_new),
	(print_dialog_new_with_parent), (print_dialog_print),
	(print_cancel_button_cb), (print_preview_button_cb):

	Don't unref the print dialogue twice when shown from
	mozilla.

3 files changed, 51 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 8acf33032..73833d29e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2003-11-02  Christian Persch  <chpe@cvs.gnome.org>
 
+	* embed/mozilla/PrintingPromptService.cpp:
+	* embed/print-dialog.c: (print_dialog_new),
+	(print_dialog_new_with_parent), (print_dialog_print),
+	(print_cancel_button_cb), (print_preview_button_cb):
+
+	Don't unref the print dialogue twice when shown from
+	mozilla.
+
+2003-11-02  Christian Persch  <chpe@cvs.gnome.org>
+
 	* embed/mozilla/mozilla-embed.cpp: (impl_print):
 
 	Unset silent mode after printing, should fix bug #125984.
diff --git a/embed/mozilla/PrintingPromptService.cpp b/embed/mozilla/PrintingPromptService.cpp
index 1288e2cc8..2e1783782 100644
--- a/embed/mozilla/PrintingPromptService.cpp
+++ b/embed/mozilla/PrintingPromptService.cpp
@@ -53,6 +53,7 @@ NS_IMETHODIMP GPrintingPromptService::ShowPrintDialog(nsIDOMWindow *parent, nsIW
 {
 	EphyDialog *dialog;
 	EmbedPrintInfo *info;
+	nsresult rv = NS_OK;
 
 	GtkWidget *gtkParent = MozillaFindGtkParent(parent);
 	EphyEmbed *embed = EPHY_EMBED (MozillaFindEmbed (parent));
@@ -66,10 +67,16 @@ NS_IMETHODIMP GPrintingPromptService::ShowPrintDialog(nsIDOMWindow *parent, nsIW
 		MozillaCollatePrintSettings(info, printSettings);
 		print_free_info(info);
 
-		return NS_OK;
+		rv = NS_OK;
 	}
 	else
-		return NS_ERROR_FAILURE;
+	{
+		rv = NS_ERROR_FAILURE;
+	}
+
+	g_object_unref (dialog);
+
+	return rv;
 }
 
 /* void showProgress (in nsIDOMWindow parent, in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings, in nsIObserver openDialogObserver, in boolean isForPrinting, out nsIWebProgressListener webProgressListener, out nsIPrintProgressParams printProgressParams, out boolean notifyOnOpen); */
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index efecf68d5..841804cc1 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -82,7 +82,8 @@ enum
 	TO_PROP,
 	FROM_PROP,
 	COLOR_PROP,
-	ORIENTATION_PROP
+	ORIENTATION_PROP,
+	PREVIEW_PROP
 };
 
 enum
@@ -112,6 +113,7 @@ EphyDialogProperty properties [] =
 	{ FROM_PROP, "from_spinbutton", NULL, PT_NORMAL, NULL },
 	{ COLOR_PROP, "print_color_radiobutton", CONF_PRINT_COLOR, PT_NORMAL, NULL },
 	{ ORIENTATION_PROP, "orient_p_radiobutton", CONF_PRINT_ORIENTATION, PT_NORMAL, NULL },
+	{ PREVIEW_PROP, "preview_button", NULL, PT_NORMAL, NULL },
 
 	{ -1, NULL, NULL }
 };
@@ -210,8 +212,17 @@ print_dialog_new (EphyEmbed *embed,
 						  "embed", embed,
 						  NULL));
 
-	if (!embed) dialog->only_collect_info = TRUE;
-	dialog->ret_info = ret_info;
+	if (ret_info != NULL)
+	{
+		GtkWidget *button;
+
+		dialog->only_collect_info = TRUE;
+		dialog->ret_info = ret_info;
+
+		button = ephy_dialog_get_control (EPHY_DIALOG (dialog),
+						  PREVIEW_PROP);
+		gtk_widget_hide (button);
+	}
 
 	return EPHY_DIALOG(dialog);
 }
@@ -228,8 +239,17 @@ print_dialog_new_with_parent (GtkWidget *window,
 						  "ParentWindow", window,
 						  NULL));
 
-	if (!embed) dialog->only_collect_info = TRUE;
-	dialog->ret_info = ret_info;
+	if (ret_info != NULL)
+	{
+		GtkWidget *button;
+
+		dialog->only_collect_info = TRUE;
+		dialog->ret_info = ret_info;
+
+		button = ephy_dialog_get_control (EPHY_DIALOG (dialog),
+						  PREVIEW_PROP);
+		gtk_widget_hide (button);
+	}
 
 	return EPHY_DIALOG(dialog);
 }
@@ -373,6 +393,8 @@ print_dialog_print (EphyDialog *dialog)
 	if(EPHY_PRINT_DIALOG(dialog)->only_collect_info && EPHY_PRINT_DIALOG(dialog)->ret_info)
 	{
 		*(EPHY_PRINT_DIALOG(dialog)->ret_info) = info;
+
+		return;
 	}
 	else
 	{
@@ -419,6 +441,11 @@ void
 print_cancel_button_cb (GtkWidget *widget,
 			EphyDialog *dialog)
 {
+	if (EPHY_PRINT_DIALOG (dialog)->only_collect_info)
+	{
+		return;
+	}
+
 	g_object_unref (G_OBJECT(dialog));
 }
 
@@ -437,5 +464,3 @@ print_preview_button_cb (GtkWidget *widget,
 	if(!(EPHY_PRINT_DIALOG(dialog)->only_collect_info))
 		print_dialog_preview (dialog);
 }
-
-