diff options
| author | 9 <NotZed@Ximian.com> | 2001-11-10 05:48:42 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2001-11-10 05:48:42 +0800 |
| commit | 7f1c4d58ea508131328d7646250688460c1acffa (patch) | |
| tree | 43d1a8eb153f7ce0a7786420cba2cb18d30b559c | |
| parent | d437e7873dcc8c7a2f2eb4fd4597f419252ff26a (diff) | |
| download | gsoc2013-evolution-7f1c4d58ea508131328d7646250688460c1acffa.tar gsoc2013-evolution-7f1c4d58ea508131328d7646250688460c1acffa.tar.gz gsoc2013-evolution-7f1c4d58ea508131328d7646250688460c1acffa.tar.bz2 gsoc2013-evolution-7f1c4d58ea508131328d7646250688460c1acffa.tar.lz gsoc2013-evolution-7f1c4d58ea508131328d7646250688460c1acffa.tar.xz gsoc2013-evolution-7f1c4d58ea508131328d7646250688460c1acffa.tar.zst gsoc2013-evolution-7f1c4d58ea508131328d7646250688460c1acffa.zip | |
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.
svn path=/trunk/; revision=14648
| -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 0d5a91551c..1e5a8d7f7b 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 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)); |