From 5cb69c583737e25ba445a7b6747f6b1a98e2bd2a Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 21 May 2008 06:38:04 +0000 Subject: [PATCH] 2008-05-21 [colin] 3.4.0cvs58 * src/imap.c Fix cvs56 (brain fart) --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/imap.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cafd4c6ac..90655a037 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-21 [colin] 3.4.0cvs58 + + * src/imap.c + Fix cvs56 (brain fart) + 2008-05-21 [colin] 3.4.0cvs57 * src/common/utils.c diff --git a/PATCHSETS b/PATCHSETS index df8a48d5d..6b40383f1 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3353,3 +3353,4 @@ ( 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 ( cvs diff -u -r 1.36.2.139 -r 1.36.2.140 src/common/utils.c; ) > 3.4.0cvs57.patchset +( cvs diff -u -r 1.179.2.221 -r 1.179.2.222 src/imap.c; ) > 3.4.0cvs58.patchset diff --git a/configure.ac b/configure.ac index 4bab55fa2..c3277dc3c 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=57 +EXTRA_VERSION=58 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/imap.c b/src/imap.c index a367fbf01..5b3e92d47 100644 --- 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_val_if_fail(account->userid != NULL, -1, MAILIMAP_ERROR_BAD_STATE); + g_return_val_if_fail(account->userid != NULL, MAILIMAP_ERROR_BAD_STATE); acc_pass = account->passwd; try_again: pass = acc_pass; -- 2.25.1