* Opening a folder updates recent count in maildrops.

  * Fixes to configure script so that it will not require PAM for every system.
  * Fix to configure script so that it will use CPPFLAGS instead of
    CPPCFLAGS, and so the --with-ssl-include-dir option take effect
    during the build. Fix by Ulf-Dietrich Braumann.
  * Fix in WebAlpine: do not use deprecated dereference in pointer,
    needs to use tcl_getstringresult() instead. Reported by Ulf-Dietrich
    Braumann.
  * Fix in configure script to detect location of tcl library; add
    /usr/local in FreeBSD and fix a bug in configure script that used
    $alpine_TCLINC instead of $alpine_TCLINC/tcl.h. Reported and fixed
    by Werner Scheinast.
  * Move SSL configurations from UW-IMAP to configure script.

7 files changed, 46 insertions, 12 deletions

diff --git a/pith/Makefile.in b/pith/Makefile.in
index c3c18ed5..c2978fc9 100644
--- a/pith/Makefile.in
+++ b/pith/Makefile.in
@@ -203,6 +203,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 ISPELLPROG = @ISPELLPROG@
+Includedir = @Includedir@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -293,7 +294,6 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
@@ -303,7 +303,7 @@ localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
+oldIncludedir = @oldIncludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
diff --git a/pith/charconv/Makefile.in b/pith/charconv/Makefile.in
index 28e6c4dd..2b02eabc 100644
--- a/pith/charconv/Makefile.in
+++ b/pith/charconv/Makefile.in
@@ -135,6 +135,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 ISPELLPROG = @ISPELLPROG@
+Includedir = @Includedir@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -225,7 +226,6 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
@@ -235,7 +235,7 @@ localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
+oldIncludedir = @oldIncludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
diff --git a/pith/folder.c b/pith/folder.c
index d07604a0..4536400e 100644
--- a/pith/folder.c
+++ b/pith/folder.c
@@ -2356,7 +2356,7 @@ update_folder_unseen_by_stream(MAILSTREAM *strm, unsigned long flags)
 {
   CONTEXT_S *ctxt;
   int ftotal, i;
-  char mailbox_name[MAILTMPLEN];
+  char mailbox_name[MAILTMPLEN], *target;
   char *cn, tmp[MAILTMPLEN];
   FOLDER_S *f;
 
@@ -2371,7 +2371,12 @@ update_folder_unseen_by_stream(MAILSTREAM *strm, unsigned long flags)
     for(i = 0; i < ftotal; i++){
       f = folder_entry(i, FOLDERS(ctxt));
       context_apply(mailbox_name, ctxt, f->name, MAILTMPLEN);
-      if(same_stream_and_mailbox(mailbox_name, strm)
+
+      if((check_for_move_mbox(mailbox_name, NULL, 0, &target)
+		&& strm->snarf.name
+		&& (!strcmp(target,strm->mailbox)
+		    || !strcmp(target,strm->original_mailbox)))
+	 || same_stream_and_mailbox(mailbox_name, strm)
          || (!IS_REMOTE(mailbox_name) && (cn=mailboxfile(tmp,mailbox_name)) && (*cn) && (!strcmp(cn, strm->mailbox) || !strcmp(cn, strm->original_mailbox)))){
 	/* if we failed earlier on this one, give it another go */
 	if(f->last_unseen_update == LUU_NOMORECHK)
diff --git a/pith/osdep/Makefile.in b/pith/osdep/Makefile.in
index 8b08c7f9..b88a5a8b 100644
--- a/pith/osdep/Makefile.in
+++ b/pith/osdep/Makefile.in
@@ -142,6 +142,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 ISPELLPROG = @ISPELLPROG@
+Includedir = @Includedir@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -232,7 +233,6 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
@@ -242,7 +242,7 @@ localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
+oldIncludedir = @oldIncludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
diff --git a/pith/pine.hlp b/pith/pine.hlp
index e3b5b627..73400f09 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 23 2013-08-11 11:25:41
+Alpine Commit 24 2013-08-18 01:59:22
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -179,6 +179,36 @@ Additions include:
 <P>
 
 <UL>
+  <LI> Opening a folder updates recent count in maildrops.
+</UL>
+
+<P>
+Bugs that have been addressed include:
+<UL>
+  <LI> Fixes to configure script so that it will not require PAM for every system.
+  <LI> Fix to configure script so that it will use CPPFLAGS instead of 
+       CPPCFLAGS, and so the --with-ssl-include-dir option take effect 
+       during the build. Fix by Ulf-Dietrich Braumann.
+  <LI> Fix in WebAlpine: do not use deprecated dereference in pointer, 
+       needs to use tcl_getstringresult() instead. Reported by Ulf-Dietrich Braumann.
+  <LI> Fix in configure script to detect location of tcl library; add
+       /usr/local in FreeBSD and fix a bug in configure script that used
+       $alpine_TCLINC instead of $alpine_TCLINC/tcl.h. Reported and fixed
+       by Werner Scheinast.
+  <LI> Move SSL configurations from UW-IMAP to configure script.
+</UL>
+<P>
+
+
+<P>
+Version 2.11 addresses bugs found in previous releases and has a few 
+additions as well.
+
+<P>
+Additions include:
+<P>
+
+<UL>
    <LI> Alpine requires version 1.0.1c of Openssl to build.
    <LI> Increase encryption of S/MIME encrypted messages.
    <LI> Pico: Improvements in justification of paragraphs: lines that begin
@@ -211,7 +241,7 @@ Bugs that have been addressed include:
   <LI> Do not bail out during a tcp timeout, instead close connection and avoid crash.
   <LI> Do not use a shell to open a browser.
   <LI> Configure script did not test for crypto or pam libraries.
-  <LI> Configure script still built web component, even if header file tcl.h was not present.
+  <LI> Configure script attempted to build web component, even if header file tcl.h was not present.
   <LI> Change Cygwin directory separator to &quot;/&quot;.
   <LI> Alpine could set List- headers, contrary to RFC 2369.
 </UL>
diff --git a/pith/string.c b/pith/string.c
index 84717c3e..a0a826df 100644
--- a/pith/string.c
+++ b/pith/string.c
@@ -65,7 +65,6 @@ static char rcsid[] = "$Id: string.c 910 2008-01-14 22:28:38Z hubert@u.washingto
 
 void        char_to_octal_triple(int, char *);
 char       *dollar_escape_dollars(char *);
-time_t      date_to_local_time_t(char *date);
 
 
 
diff --git a/pith/string.h b/pith/string.h
index 11c4d45f..5a3a3bd5 100644
--- a/pith/string.h
+++ b/pith/string.h
@@ -146,6 +146,6 @@ STRLIST_S  *copy_strlist(STRLIST_S *);
 void	    combine_strlists(STRLIST_S **, STRLIST_S *);
 void	    free_strlist(STRLIST_S **);
 int         read_octal(char **);
-
+time_t      date_to_local_time_t(char *);
 
 #endif /* PITH_STRING_INCLUDED */