sync with 0.8.1cvs1

diff --git a/ChangeLog b/ChangeLog
index 59d59c6ef49271b7ae9135f8a0108e0c465e68e0..2c41a71e28cd16523c4f5fa31664537d73a9e2e9 100644 (file)
--- 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
 2002-07-25
 
        * version 0.8.1

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3af56a10fe1050e45be5c17a9250168078f91377..db0d1e830a3a66ea7d2eb6e7086210c330db43dd 100644 (file)
--- 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]
 2002-07-26 [christoph] 0.8.0claws15
 
        * src/imap.[ch]

diff --git a/ChangeLog.jp b/ChangeLog.jp
index f76a9e84a345da853e02b9e896199061d9d5651b..45a9739d14bb39c38b6f9c23a4bf5385c6b29796 100644 (file)
--- 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
 2002-07-25
 
        * version 0.8.1

diff --git a/configure.in b/configure.in
index f488f76a0246c7b28637c8e0e606e3b48bdfbf27..69f87ac28499a419529801a7520d8d2844269383 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/inc.c b/src/inc.c
index 4b6252136978bc80685e5018c1d80b132e7f2695..69445933f11788163bb40c3eec0724b603cc9dec 100644 (file)
--- 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 (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();
        } 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);
 
        inc_autocheck_timer_remove();
        main_window_lock(mainwin);
 

-       if (prefs_common.inc_local)
+       if (prefs_common.inc_local) {

                new_msgs = inc_spool();
                new_msgs = inc_spool();

+               if (new_msgs < 0)
+                       new_msgs = 0;
+       }

 
        list = account_get_list();
        if (!list) {
 
        list = account_get_list();
        if (!list) {