From 8f90ec8eaf4984f769047456c9103c5df1d81807 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 26 Jul 2002 09:05:51 +0000
Subject: [PATCH] sync with 0.8.1cvs1

---
 ChangeLog       | 7 +++++++
 ChangeLog.claws | 5 +++++
 ChangeLog.jp    | 7 +++++++
 configure.in    | 2 +-
 src/inc.c       | 8 +++++++-
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59d59c6ef..2c41a71e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-26
+
+	* src/inc.c:
+	  inc_mail(): force summary refresh when using external command for
+	  incorporation.
+	  inc_all_account_mail(): fixed a bug on spool checking failure.
+
 2002-07-25
 
 	* version 0.8.1
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3af56a10f..db0d1e830 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-07-26 [paul]	0.8.0claws16
+
+	* sync with 0.8.1cvs1
+		see ChangeLog 2002-07-26
+
 2002-07-26 [christoph]	0.8.0claws15
 
 	* src/imap.[ch]
diff --git a/ChangeLog.jp b/ChangeLog.jp
index f76a9e84a..45a9739d1 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,10 @@
+2002-07-26
+
+	* src/inc.c
+	  inc_mail(): ¼è¹þ¤Ë³°Éô¥³¥Þ¥ó¥É¤ò»È¤Ã¤¿¤È¤­¤Ï¥µ¥Þ¥ê¤Î¹¹¿·¤ò¶¯À©
+	  ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+	  inc_all_account_mail(): ¥¹¥×¡¼¥ë¤Î¥Á¥§¥Ã¥¯¤Î¼ºÇÔ»þ¤Î¥Ð¥°¤ò½¤Àµ¡£
+
 2002-07-25
 
 	* version 0.8.1
diff --git a/configure.in b/configure.in
index f488f76a0..69f87ac28 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws15
+EXTRA_VERSION=claws16
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/inc.c b/src/inc.c
index 4b6252136..69445933f 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -186,6 +186,9 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
 
 		if (prefs_common.inc_local)
 			new_msgs = inc_spool();
+
+		if (new_msgs <= 0)
+			new_msgs = 1;
 	} else {
 		if (prefs_common.inc_local)
 			new_msgs = inc_spool();
@@ -280,8 +283,11 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean notify)
 	inc_autocheck_timer_remove();
 	main_window_lock(mainwin);
 
-	if (prefs_common.inc_local)
+	if (prefs_common.inc_local) {
 		new_msgs = inc_spool();
+		if (new_msgs < 0)
+			new_msgs = 0;
+	}
 
 	list = account_get_list();
 	if (!list) {
-- 
2.25.1