2007-11-26 [colin] 3.1.0cvs29

	* src/imap.c
		Fix bug 1405, 'imap auto auth method doesn't
		work since 3.1.0'

diff --git a/ChangeLog b/ChangeLog
index bce87ad7c13834fc2c0eaee2d8fa12c7dd12632a..e9e4ff3c5955faf24e313ba8569e6094d8d7601c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-26 [colin]     3.1.0cvs29
+
+       * src/imap.c
+               Fix bug 1405, 'imap auto auth method doesn't 
+               work since 3.1.0'
+
 2007-11-26 [colin]     3.1.0cvs28
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 8312c1cde05ec4669b47ac0dcc6c78e2048f17e9..ebc08b69dbaac6f9b65007d1e6005704742b069b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3086,3 +3086,4 @@
 ( cvs diff -u -r 1.75.2.51 -r 1.75.2.52 src/matcher.c;  cvs diff -u -r 1.39.2.15 -r 1.39.2.16 src/matcher.h;  cvs diff -u -r 1.25.2.32 -r 1.25.2.33 src/matcher_parser_parse.y;  cvs diff -u -r 1.43.2.64 -r 1.43.2.65 src/prefs_matcher.c;  ) > 3.1.0cvs26.patchset
 ( cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/folder_item_prefs.h;  ) > 3.1.0cvs27.patchset
 ( cvs diff -u -r 1.94.2.164 -r 1.94.2.165 src/messageview.c;  cvs diff -u -r 1.49.2.103 -r 1.49.2.104 src/procmime.c;  ) > 3.1.0cvs28.patchset
+( cvs diff -u -r 1.179.2.198 -r 1.179.2.199 src/imap.c;  ) > 3.1.0cvs29.patchset

diff --git a/configure.ac b/configure.ac
index c39e2f1f607bf39fcb4db7c32faf1733de3f738f..163a3f889bfc052b6447351136f41cb3d83f3e02 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/imap.c b/src/imap.c
index c769bb4a50331951bc70067f7bdfe6d72214c080..d09da6b894cb441e02a4ea26caca1d60f322f70f 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -845,9 +845,11 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
                        imap_has_capability(session, "GSSAPI"));
                if (imap_has_capability(session, "CRAM-MD5"))
                        ok = imap_cmd_login(session, user, pass, "CRAM-MD5");
-               if (ok == MAILIMAP_ERROR_BAD_STATE && imap_has_capability(session, "GSSAPI"))
+               if ((ok == MAILIMAP_ERROR_BAD_STATE ||
+                    ok == MAILIMAP_ERROR_LOGIN) && imap_has_capability(session, "GSSAPI"))
                        ok = imap_cmd_login(session, user, pass, "GSSAPI");
-               if (ok == MAILIMAP_ERROR_BAD_STATE) /* we always try LOGIN before giving up */
+               if (ok == MAILIMAP_ERROR_BAD_STATE||
+                   ok == MAILIMAP_ERROR_LOGIN) /* we always try LOGIN before giving up */
                        ok = imap_cmd_login(session, user, pass, "LOGIN");
        }