diff options
| author | 9 <NotZed@Ximian.com> | 2001-11-09 21:48:42 +0000 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2001-11-09 21:48:42 +0000 |
| commit | b0aade28a0401e6a06cc7eebf51c4040415a5a5b (patch) | |
| tree | 6541539eb3729b424944e87be045928b0e731d83 | |
| parent | c984c2ce6ef8ce8c8b1be8e8f5855aee53172e07 (diff) | |
| download | evolution-data-server-b0aade28a0401e6a06cc7eebf51c4040415a5a5b.tar.gz | |
If we get a user cancel and that causes us to fail to authenticate, abort
2001-11-09 <NotZed@Ximian.com>
* providers/imap/camel-imap-store.c (imap_auth_loop): If we get a
user cancel and that causes us to fail to authenticate, abort
rather than loop forever. Fix for #14951.
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-store.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 0d5a91551..1e5a8d7f7 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-11-09 <NotZed@Ximian.com> + + * providers/imap/camel-imap-store.c (imap_auth_loop): If we get a + user cancel and that causes us to fail to authenticate, abort + rather than loop forever. Fix for #14951. + 2001-11-06 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-command.c diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index 081106128..cee990ee6 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -590,6 +590,9 @@ imap_auth_loop (CamelService *service, CamelException *ex) } } if (!authenticated) { + if (camel_exception_get_id(ex) == CAMEL_EXCEPTION_USER_CANCEL) + return FALSE; + errbuf = g_strdup_printf (_("Unable to authenticate " "to IMAP server.\n%s\n\n"), camel_exception_get_description (ex)); |