talons

commit bfaf199008a9375ac879ef16b22f41deaf1affd4
parent 10c65fe9146092902ec80580386ec7955c4dfcb8
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 21 May 2008 06:33:27 +0000

2008-05-21 [colin]	3.4.0cvs56

	* src/imap.c
		Fix a warning

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

4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-21 [colin]	3.4.0cvs56
+
+	* src/imap.c
+		Fix a warning
+
 2008-05-19 [colin]	3.4.0cvs55
 
 	* src/plugins/pgpcore/sgpgme.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3351,3 +3351,4 @@
 ( cvs diff -u -r 1.105.2.131 -r 1.105.2.132 src/prefs_account.c;  ) > 3.4.0cvs53.patchset
 ( cvs diff -u -r 1.1.4.50 -r 1.1.4.51 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.72 -r 1.43.2.73 src/prefs_matcher.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/common/tags.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/common/tags.h;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/combobox.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/combobox.h;  ) > 3.4.0cvs54.patchset
 ( cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/plugins/pgpcore/sgpgme.c;  ) > 3.4.0cvs55.patchset
+( cvs diff -u -r 1.179.2.220 -r 1.179.2.221 src/imap.c;  ) > 3.4.0cvs56.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=55
+EXTRA_VERSION=56
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap.c b/src/imap.c
@@ -1156,7 +1156,7 @@ static gint imap_session_authenticate(IMAPSession *session,
 	gchar *pass, *acc_pass;
 	gboolean failed = FALSE;
 	gint ok = MAILIMAP_NO_ERROR;
-	g_return_if_fail(account->userid != NULL);
+	g_return_val_if_fail(account->userid != NULL, -1, MAILIMAP_ERROR_BAD_STATE);
 	acc_pass = account->passwd;
 try_again:
 	pass = acc_pass;