2008-05-21 [colin] 3.4.0cvs58

	* src/imap.c
		Fix cvs56 (brain fart)

diff --git a/ChangeLog b/ChangeLog
index cafd4c6ac701a4c4359fb61b7919923dee456172..90655a0376b01698f0775237c0e59d04cc2fe7f7 100644 (file)
--- 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
 2008-05-21 [colin]     3.4.0cvs57
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index df8a48d5daf3c94e24d1a45a42c8f7c0fd372381..6b40383f1900fd54c536d60487c0e7c6f777d838 100644 (file)
--- 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.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 4bab55fa22ff1b68fca62c9280617d7bf8cbce8a..c3277dc3c13b4c3f29ceffe73a57472456152dc8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=57
+EXTRA_VERSION=58

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/imap.c b/src/imap.c
index a367fbf019b577cfc5ae2da273a587eb987f5f94..5b3e92d476e480198a4e192ad4d0bbc02c213fe0 100644 (file)
--- 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;
        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;
        acc_pass = account->passwd;
 try_again:
        pass = acc_pass;