talons

commit d2324679499f13e4ea9c2d6e67458f5008738fda
parent 769e25ef391ab03be684aea672bfc6ea45359556
Author: Colin Leroy <colin@colino.net>
Date:   Sat, 31 May 2008 16:10:29 +0000

2008-05-31 [colin]	3.4.0cvs76

	* src/imap.c
		Fix login issue introduced in cvs75.

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

4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-31 [colin]	3.4.0cvs76
+
+	* src/imap.c
+		Fix login issue introduced in cvs75.
+
 2008-05-31 [colin]	3.4.0cvs75
 
 	* src/imap.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3371,3 +3371,4 @@
 ( cvs diff -u -r 1.60.2.53 -r 1.60.2.54 src/procmsg.h;  ) > 3.4.0cvs73.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 manual/keyboard.xml;  ) > 3.4.0cvs74.patchset
 ( cvs diff -u -r 1.179.2.223 -r 1.179.2.224 src/imap.c;  ) > 3.4.0cvs75.patchset
+( cvs diff -u -r 1.179.2.224 -r 1.179.2.225 src/imap.c;  ) > 3.4.0cvs76.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=75
+EXTRA_VERSION=76
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap.c b/src/imap.c
@@ -817,7 +817,7 @@ static gboolean imap_has_capability(IMAPSession *session, const gchar *cap)
 static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass,
 		      IMAPAuthType type)
 {
-	gint ok = MAILIMAP_ERROR_BAD_STATE;
+	gint ok = MAILIMAP_ERROR_LOGIN;
 	static time_t last_login_err = 0;
 	gchar *ext_info = "";
 	int r;
@@ -3449,11 +3449,11 @@ static gint imap_cmd_login(IMAPSession *session,
 					"has been compiled without OpenSSL "
 					"support.\n"),
 					SESSION(session)->server);
-			return MAILIMAP_ERROR_BAD_STATE;
+			return MAILIMAP_ERROR_LOGIN;
 #endif
 		} else {
 			log_error(LOG_PROTOCOL, _("Server logins are disabled.\n"));
-			return MAILIMAP_ERROR_BAD_STATE;
+			return MAILIMAP_ERROR_LOGIN;
 		}
 	}