From 9862306af9b5019372cbcb6693b5ae1d56297776 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Mon, 12 Feb 2007 06:11:14 +0000 Subject: Print migration updates from Ebby Wiselyn. svn path=/trunk/; revision=33201 --- mail/em-folder-view.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'mail/em-folder-view.c') diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index a1f24b1c8c..933382d4e1 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -44,8 +44,6 @@ #include -#include - #include #include @@ -2144,8 +2142,12 @@ emfv_print_response(GtkWidget *w, int resp, struct _print_data *data) g_object_unref(print); break; } - g_object_unref (data->emfv); - g_object_unref (data->settings); + + if (w) + gtk_widget_destroy (w); + + g_object_unref (data->emfv); + g_object_unref (data->settings); camel_object_unref (data->folder); g_free (data->uid); g_free (data); @@ -2170,7 +2172,7 @@ int em_folder_view_print(EMFolderView *emfv, int preview) data = g_malloc0(sizeof(*data)); data->emfv = emfv; g_object_ref(emfv); - data->settings = e_print_load_config (); + data->settings = e_print_load_settings (); data->preview = preview; data->folder = emfv->folder; camel_object_ref(data->folder); @@ -2179,13 +2181,13 @@ int em_folder_view_print(EMFolderView *emfv, int preview) if (preview) { GtkDialog *dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), - GNOME_PRINT_DIALOG_COPIES, data->settings); + 0, data->settings); gtk_dialog_set_default_response (dialog, GTK_RESPONSE_APPLY); e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) emfv); emfv_print_response(dialog, GTK_RESPONSE_APPLY, data); } else { GtkDialog *dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), - GNOME_PRINT_DIALOG_COPIES, data->settings); + 0, data->settings); gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK); e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) emfv); emfv_print_response (dialog, GTK_RESPONSE_OK, data); -- cgit v1.2.3