From: Paul Mangan <paul@claws-mail.org>
Date: Mon, 27 May 2002 13:14:05 +0000 (+0000)
Subject: sync with 0.7.6cvs15
X-Git-Tag: rel_0_7_7~40
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=b7c0e731c88bc04396014906f9f569ada51ef23e

sync with 0.7.6cvs15
---

diff --git a/ChangeLog b/ChangeLog
index adade3d8f..977e77cdc 100644
--- 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 8773adef9..398536002 100644
--- 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 7bf045a93..077a19c13 100644
--- 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 02832f77f..53ecb13d3 100644
--- 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 507a6b14a..68dcf6226 100644
--- 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;