* src/folder.c

        fix folder update for newsgroups with message
        numbers below minimum number of articles to fetch
        (closes bug #598445)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9dfabf32e3001b93ac7fa2de4e666f6dc0f33e5d..1289e958d5ed72fddd3d2930ff4da8a06e94e3fb 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-08-22 [christoph] 0.8.1claws99
+
+       * src/folder.c
+               fix folder update for newsgroups with message
+               numbers below minimum number of articles to fetch
+               (closes bug #598445)
+
 2002-08-22 [paul]      0.8.1claws98
 
        * sync with 0.8.1cvs28

diff --git a/configure.in b/configure.in
index b2a945161e77a8b7f602928e5c3029cc1437e7ca..e7c5ea32b538987d7b2a0ac0c3711d6873c95684 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws98
+EXTRA_VERSION=claws99
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index ff1e22c6d55a7c62ee601d5a6256b67776c6bd7a..cfb7fb771ea09ae7883f1503a4bfd42f666fcf44 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -965,13 +965,27 @@ gint folder_item_scan(FolderItem *item)
                num = i + min;
                /* Add message to cache if in folder and not in cache */
                if( (folderscaninfo[i] & IN_FOLDER) && 
-                  !(folderscaninfo[i] & IN_CACHE) && 
-                   (folder->type != F_NEWS ||
-                       (((prefs_common.max_articles == 0) || (num > (max - prefs_common.max_articles))) &&
-                       (num > cache_max)))
-                   ) {
-                       new_list = g_slist_prepend(new_list, GINT_TO_POINTER(num));
-                       debug_print("Remembered message %d for fetching\n", num);
+                  !(folderscaninfo[i] & IN_CACHE)) {
+                       gboolean add = FALSE;
+
+                       switch(folder->type) {
+                               case F_NEWS:
+                                       if((num > cache_max) && 
+                                          ((prefs_common.max_articles == 0) ||
+                                           (max < prefs_common.max_articles) ||
+                                           (num > (max - prefs_common.max_articles)))) {
+                                               add = TRUE;
+                                       }
+                                       break;
+                               default:
+                                       add = TRUE;
+                                       break;
+                       }
+                       
+                       if(add) {
+                               new_list = g_slist_prepend(new_list, GINT_TO_POINTER(num));
+                               debug_print("Remembered message %d for fetching\n", num);
+                       }
                }
                /* Remove message from cache if not in folder and in cache */
                if(!(folderscaninfo[i] & IN_FOLDER) && 
@@ -1059,6 +1073,8 @@ gint folder_item_scan(FolderItem *item)
        g_slist_free(new_list);
        g_free(folderscaninfo);
 
+       folderview_update_item(item, FALSE);
+
        return 0;
 }