From 7f1c4d58ea508131328d7646250688460c1acffa Mon Sep 17 00:00:00 2001 From: 9 Date: Fri, 9 Nov 2001 21:48:42 +0000 Subject: If we get a user cancel and that causes us to fail to authenticate, abort 2001-11-09 * 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. svn path=/trunk/; revision=14648 --- camel/ChangeLog | 6 ++++++ camel/providers/imap/camel-imap-store.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/camel/ChangeLog b/camel/ChangeLog index 0d5a91551c..1e5a8d7f7b 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-11-09 + + * 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 * 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 0811061280..cee990ee6b 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)); -- cgit