From f711960d8885604cf4d13d81aeb9d09bc752ca82 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 14 Sep 2001 22:19:57 +0000 Subject: Revert my bar_destroy code and replace it with dialog_destroy instead. 2001-09-14 Jeffrey Stedfast * mail-send-recv.c (build_dialogue): Revert my bar_destroy code and replace it with dialog_destroy instead. svn path=/trunk/; revision=12832 --- mail/ChangeLog | 3 +++ mail/mail-send-recv.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 9d272b3021..5c3289374b 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2001-09-14 Jeffrey Stedfast + * mail-send-recv.c (build_dialogue): Revert my bar_destroy code + and replace it with dialog_destroy instead. + * mail-ops.c (mail_send_message): Append a message to any exception we get appending to any folders after having sent the message successfully saying that the message was sent successfully diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 3cc91a6b2c..1baa28a866 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -202,9 +202,10 @@ static void hide_send_info(void *key, struct _send_info *info, void *data) } static void -bar_destroyed (GtkProgressBar *bar, struct _send_info *info) +dialog_destroy (GtkProgressBar *bar, struct _send_data *data) { - hide_send_info (NULL, info, NULL); + g_hash_table_foreach (data->active, (GHFunc) hide_send_info, NULL); + data->gd = NULL; } static void @@ -319,7 +320,6 @@ build_dialogue (GSList *sources, CamelFolder *outbox, const char *destination) bar = (GtkProgressBar *)gtk_progress_bar_new (); gtk_progress_set_show_text (GTK_PROGRESS (bar), FALSE); - gtk_signal_connect (GTK_OBJECT (bar), "destroy", bar_destroyed, info); stop = (GtkButton *)gnome_stock_button (GNOME_STOCK_BUTTON_CANCEL); status_label = (GtkLabel *)gtk_label_new ((info->type == SEND_UPDATE) ? _("Updating...") : @@ -400,6 +400,7 @@ build_dialogue (GSList *sources, CamelFolder *outbox, const char *destination) gtk_widget_show (GTK_WIDGET (gd)); gtk_signal_connect (GTK_OBJECT (gd), "clicked", dialogue_clicked, data); + gtk_signal_connect (GTK_OBJECT (gd), "destroy", dialog_destroy, data); data->infos = list; data->gd = gd; -- cgit v1.2.3