sync with 0.7.6cvs15

diff --git a/ChangeLog b/ChangeLog
index adade3d8f460a44c709f88da72bb1941d68e6587..977e77cdc3a001b0afcca3a60a513e40397925ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-27
+
+       * src/news.c: news_scan_group(): fixed a bug that set the wrong
+         values in some cases.
+       * src/prefs_account.c: corrected English in Advanced - Folder
+         settings.
+
 2002-05-23
 
        * src/textview.c: textview_show_message(), textview_show_part():

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8773adef9de1ea8b37a593ecde24afc10c01caf2..3985360024f2dfaf0b579827f5b1d05286882ccd 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-05-27 [paul]      0.7.6claws21
+       
+       * sync with 0.7.6cvs15
+               see ChangeLog 2002-05-27
+
 2002-05-27 [paul]      0.7.6claws20
 
        * src/prefs_account.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 7bf045a93dbcf71174f9b408a2304a764c18a43f..077a19c13a6376640b0295d5d9dff77b65d0fabc 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,9 @@
+2002-05-27
+
+       * src/news.c: news_scan_group(): ÆÃÄê¤Î¾ì¹ç¤Ë¸í¤Ã¤¿Ãͤò¥»¥Ã¥È¤¹¤ë
+         ¥Ð¥°¤ò½¤Àµ¡£
+       * src/prefs_account.c: ¹âÅÙ¤ÊÀßÄê - ¥Õ¥©¥ë¥À ¤ÎÀßÄê¤Î±Ñ¸ì¤ò½¤Àµ¡£
+
 2002-05-23
 
        * src/textview.c: textview_show_message(), textview_show_part():

diff --git a/configure.in b/configure.in
index 02832f77fb4e6cdae5646fa7e69bdc2725edb293..53ecb13d378e0fb1fed46af009d40bc7e88a590b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws20
+EXTRA_VERSION=claws21
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/news.c b/src/news.c
index 507a6b14ab7b25e8754546160c44d0d4535e0fb7..68dcf6226e422c4456137b0c94b785e7a0c6d347 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -392,16 +392,27 @@ gint news_scan_group(Folder *folder, FolderItem *item)
        }
        g_free(path);
 
-       if (first < min) {
+       if (max < first || last < min)
                new = unread = total = num;
-       } else if (max < first) {
-               new = unread = total = num;
-       } else if (last > max) {
-               new += last - max;
-               unread += last - max;
+       else {
+               if (min < first)
+                       min = first;
+               else if (first < min) {
+                       num -= min - first;
+                       first = min;
+               }
+
+               if (last < max)
+                       max = last;
+               else if (max < last) {
+                       new += last - max;
+                       unread += last - max;
+               }
+
                if (new > num) new = num;
                if (unread > num) unread = num;
        }
+
        item->new = new;
        item->unread = unread;
        item->total = num;