several minor things Match forgot, and first stab at fixing the folder update problem

diff --git a/AUTHORS b/AUTHORS
index c66bed4a9dba9c3095ac3433dc6fe28194337847..2ab63e1e514594725bd1c95119def3885d8fe58b 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,6 +6,7 @@ main-branch (http://sylpheed.good-day.net)
 claws-branch (http://sylpheed-claws.sourceforge.net)
 
        Hoa viet Dinh           <dinh@enseirb.fr>
+       Match Grun              <match@dimensional.com>
         Christoph Hohmann       <reboot@gmx.ch>
        Alfons Hoogervorst      <alfons@proteus.demon.nl>
        Darko Koruga            <darko.koruga@hermes.si>

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 76cf17f3d6d85d06584f2454042cb8dbdde794a5..eaddde59019ca42165007eafc38a2cbaab459d54 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,18 @@
+2001-07-09 [alfons]
+
+       * AUTHORS
+               add Match Grun
+
+       * configure.in
+               fix incorrect description of --enable-ldap parameter
+
+       * src/about.c
+               show build parameters for LDAP and JPilot
+
+       * src/summaryview.c
+               revert Christoph's bugfix for selecting next unread message, 
+               because folder stats aren't updated correctly
+
 2001-07-08 [hoa]
 
        * src/filtering.c
@@ -10,6 +25,7 @@
        * src/scoring.c
                bugfix of the config file parser
 
+>>>>>>> 1.205
 2001-07-08 [alfons]
 
        * src/Makefile.am

diff --git a/configure.in b/configure.in
index f75dd56c773468e565e3afef75d4c91feb73fced..073755c023a01a26b62820f3cd7e03a3cc513ab6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -124,7 +124,7 @@ fi
 
 dnl for LDAP support in addressbook
 AC_ARG_ENABLE(ldap,
-       [  --enable-ldap         Enable JPilot support [default=no]],
+       [  --enable-ldap         Enable LDAP support [default=no]],
        [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=no])
 
 AC_MSG_CHECKING([whether to use ldap])

diff --git a/src/about.c b/src/about.c
index 79608d1851059fd0a202d34c42fca6afdf5a45a4..efcbf111ac5a9ccc2deebfe45c8bfd3ec71499c4 100644 (file)
--- a/src/about.c
+++ b/src/about.c
@@ -146,6 +146,12 @@ static void about_create(void)
 #endif
 #if USE_GPGME
                   " GPGME"
+#endif
+#if USE_LDAP
+                  " LDAP"
+#endif
+#if USE_JPILOT
+                  " JPilot"
 #endif
        "");
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 85b01a3cb733d74516320c82f16147c75453691e..77a471f25764591d37a7c1a22b873110cf9dadeb 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1102,7 +1102,11 @@ void summary_select_next_unread(SummaryView *summaryview)
        if (node) {
                gtk_sctree_unselect_all(GTK_SCTREE(ctree));
                gtk_sctree_select(GTK_SCTREE(ctree), node);
-               gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0.0);
+
+               /* BUGFIX: select next unread message 
+                * REVERT: causes incorrect folder stats
+                * gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0.0); 
+                */
 
                if (summaryview->displayed == node)
                        summaryview->displayed = NULL;