diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-send-recv.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4f2099cbe0..d0e64beb1d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2003-01-10 Not Zed <NotZed@Ximian.com> + + * mail-send-recv.c (dialogue_response): dont unref the dialogue. + (dialog_destroy_cb): null out the send_recv_dialogue after destroy. + (build_dialogue): show the stop button + 2003-01-09 Chris Toshok <toshok@ximian.com> * folder-info.c (evolution_folder_info_notify_ready): pass bag to diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 81f2eaf8c2..532faa9866 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -210,6 +210,7 @@ dialog_destroy_cb (struct _send_data *data, GObject *deadbeef) { g_hash_table_foreach (data->active, (GHFunc) hide_send_info, NULL); data->gd = NULL; + send_recv_dialogue = NULL; } static void @@ -225,14 +226,10 @@ dialogue_response(GtkDialog *gd, int button, struct _send_data *data) gtk_dialog_set_response_sensitive(gd, GTK_RESPONSE_CANCEL, FALSE); break; default: - /* FIXME: check this works */ d(printf("hiding dialogue\n")); - gtk_widget_destroy((GtkWidget *)gd); - g_object_unref(gd); -#if 0 g_hash_table_foreach(data->active, (GHFunc)hide_send_info, NULL); data->gd = NULL; -#endif + /*gtk_widget_destroy((GtkWidget *)gd);*/ break; } } @@ -299,6 +296,7 @@ build_dialogue (const GSList *accounts, CamelFolder *outbox, const char *destina gd = (GtkDialog *)send_recv_dialogue = gtk_dialog_new_with_buttons(_("Send & Receive Mail"), NULL, 0, NULL); stop = (GtkButton *)gtk_button_new_from_stock(GTK_STOCK_CANCEL); gtk_button_set_label(stop, _("Cancel All")); + gtk_widget_show((GtkWidget *)stop); gtk_dialog_add_action_widget(gd, (GtkWidget *)stop, GTK_RESPONSE_CANCEL); g_object_set(gd, "resizable", FALSE, NULL); gnome_window_icon_set_from_file (GTK_WINDOW (gd), EVOLUTION_ICONSDIR "/send-receive.xpm"); |