talons

commit 8938237ced604aef188f7b71b6d20dce30846ae4
parent 70759aed06d8721c5670b8ce65f604d0d03b6081
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  7 Oct 2008 16:18:11 +0000

2008-10-07 [colin]	3.6.0cvs15

	* src/imap.c
		After thinking, revert this. It's only a minor
		annoyance to GSSAPI users, and I can't test this
		right now. Postponed until after next good release.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/imap.c
 | 
4
++--

4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-07 [colin]	3.6.0cvs15
+
+	* src/imap.c
+		After thinking, revert this. It's only a minor
+		annoyance to GSSAPI users, and I can't test this
+		right now. Postponed until after next good release.
+
 2008-10-07 [colin]	3.6.0cvs14
 
 	* src/imap.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3571,3 +3571,4 @@
 ( cvs diff -u -r 1.274.2.280 -r 1.274.2.281 src/mainwindow.c;  cvs diff -u -r 1.39.2.52 -r 1.39.2.53 src/mainwindow.h;  cvs diff -u -r 1.204.2.180 -r 1.204.2.181 src/prefs_common.c;  cvs diff -u -r 1.103.2.115 -r 1.103.2.116 src/prefs_common.h;  cvs diff -u -r 1.395.2.394 -r 1.395.2.395 src/summaryview.c;  cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/gtk/colorlabel.c;  ) > 3.6.0cvs12.patchset
 ( cvs diff -u -r 1.274.2.281 -r 1.274.2.282 src/mainwindow.c;  ) > 3.6.0cvs13.patchset
 ( cvs diff -u -r 1.179.2.233 -r 1.179.2.234 src/imap.c;  ) > 3.6.0cvs14.patchset
+( cvs diff -u -r 1.179.2.234 -r 1.179.2.235 src/imap.c;  ) > 3.6.0cvs15.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap.c b/src/imap.c
@@ -1163,7 +1163,7 @@ static gint imap_session_authenticate(IMAPSession *session,
 	acc_pass = account->passwd;
 try_again:
 	pass = acc_pass;
-	if (!pass && account->imap_auth_type != IMAP_AUTH_ANON && account->imap_auth_type != IMAP_AUTH_GSSAPI) {
+	if (!pass && account->imap_auth_type != IMAP_AUTH_ANON) {
 		gchar *tmp_pass;
 		tmp_pass = input_dialog_query_password_keep(account->recv_server, 
 							    account->userid,
@@ -1172,7 +1172,7 @@ try_again:
 			return MAILIMAP_NO_ERROR;
 		Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return MAILIMAP_NO_ERROR;});
 		g_free(tmp_pass);
-	} else if (account->imap_auth_type == IMAP_AUTH_ANON || account->imap_auth_type == IMAP_AUTH_GSSAPI) {
+	} else if (account->imap_auth_type == IMAP_AUTH_ANON) {
 		pass = "";
 	}
 	statuswindow_print_all(_("Connecting to IMAP4 server %s...\n"),