aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-threads.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ee34afea22..465a34f62a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-11 Peter Williams <peterw@helixcode.com>
+
+ * mail-threads.c (get_password_clicked): Fix the case when the
+ user /doesn't/ use escape to cancel the dialog :-/
+ (show_error_clicked): Same.
+
2000-08-11 Dan Winship <danw@helixcode.com>
* mail-tools.c (mail_tool_get_folder_name): Add a function to
diff --git a/mail/mail-threads.c b/mail/mail-threads.c
index ab85daf1c6..bdfa7b260f 100644
--- a/mail/mail-threads.c
+++ b/mail/mail-threads.c
@@ -1029,6 +1029,8 @@ show_error_clicked (GtkObject * obj)
{
gchar *old_message;
+ gtk_signal_disconnect_by_func (GTK_OBJECT (obj), show_error_clicked, NULL);
+
/* Restore the old message */
old_message = gtk_object_get_data (obj, "old_message");
gtk_label_set_text (GTK_LABEL (queue_window_message),
@@ -1113,6 +1115,8 @@ get_password_clicked (GnomeDialog * dialog, gint button, gpointer user_data)
com_msg_t *msg = (com_msg_t *) user_data;
gchar *old_message;
+ gtk_signal_disconnect_by_func (GTK_OBJECT (dialog), get_password_deleted, user_data);
+
/* Restore the old message */
old_message = gtk_object_get_data (GTK_OBJECT (dialog), "old_message");
gtk_label_set_text (GTK_LABEL (queue_window_message),