aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-ops.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 152da07598..557cadf3e8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-28 Dan Winship <danw@helixcode.com>
+
+ * mail-ops.c (fetch_mail): don't put up an error message if the
+ user cancels the password dialog.
+
2000-05-27 Not Zed <NotZed@HelixCode.com>
* Makefile.am (SHELL_OBJS): Include mail storage so we can
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 873dc7e6ab..150231297e 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -161,7 +161,8 @@ fetch_mail (GtkWidget *button, gpointer user_data)
camel_service_connect_with_url (CAMEL_SERVICE (store),
url, ex);
if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
- mail_exception_dialog ("Unable to get new mail", ex, fb);
+ if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_USER_CANCEL)
+ mail_exception_dialog ("Unable to get new mail", ex, fb);
goto cleanup;
}