Properly handle IMAP cache files.

diff --git a/configure.in b/configure.in
index 0db0426ca937ef8cb4a97e4a3f89841c20704434..1d1d8bc8fb1a159ba1d87f5dc8e38396cf0d63df 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -445,7 +445,7 @@ AC_ARG_ENABLE(imap, [  --enable-imap              Enable IMAP support],
        AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
        AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
        LIBIMAP="-Limap -limap"
-       LIBIMAPDEPS="\$(srcdir)/imap/imap.h \$(srcdir)/imap/libimap.a"
+       LIBIMAPDEPS="\$(srcdir)/imap/imap.h imap/libimap.a"
        CPPFLAGS="$CPPFLAGS -I\$(srcdir)/imap"
        need_imap="yes"
 ])

diff --git a/imap/imap.c b/imap/imap.c
index 2125e0798cfa551b316eb1485bafb11537e8b7b4..51347f938faf7b2599bbad903ee80ef8297b8b11 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1864,6 +1864,7 @@ void imap_fastclose_mailbox (CONTEXT *ctx)
 
   if ((CTX_DATA->state == IMAP_SELECTED) && (ctx == CTX_DATA->selected_ctx))
     if (imap_close_mailbox (CTX_DATA) != 0)
+      return;
 
   for (i = 0; i < IMAP_CACHE_LEN; i++)
   {

diff --git a/main.c b/main.c
index 18e042024974405a20ce6a59a16279297cf7cec7..f35707c5df7b064e8a770cc7a64d19c5a9521d02 100644 (file)
--- a/main.c
+++ b/main.c
@@ -197,6 +197,12 @@ static void show_version (void)
         "-USE_IMAP  "
 #endif
 
+#ifdef USE_GSS
+       "+USE_GSS  "
+#else
+       "-USE_GSS  "
+#endif
+
 #ifdef USE_POP
        "+USE_POP  "
 #else