sync with 0.8.2cvs14
authorPaul Mangan <paul@claws-mail.org>
Wed, 11 Sep 2002 07:56:56 +0000 (07:56 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 11 Sep 2002 07:56:56 +0000 (07:56 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/inc.c

index 8588edc..5895477 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-11
+
+       * src/inc.c: inc_mail(): correct new_msgs when inc_spool() returned
+         by error.
+         Don't refresh summary view on fetching when open_inbox_on_inc is
+         set.
+
 2002-09-10
 
        * src/summaryview.c: summary_show(): refresh even if open_inbox_on_inc
index a49c74a..c6d6b63 100644 (file)
@@ -1,3 +1,8 @@
+2002-09-11 [paul]      0.8.2claws38
+
+       * sync with 0.8.2cvs14
+               see ChangeLog 2002-09-11
+
 2002-09-11 [colin]     0.8.2claws37
 
        * src/folder.c
index 2cf3120..e33bfd1 100644 (file)
@@ -1,3 +1,10 @@
+2002-09-11
+
+       * src/inc.c: inc_mail(): inc_spool() ¤¬¥¨¥é¡¼¤Çµ¢¤Ã¤¿¤È¤­¤Î
+         new_msgs ¤òÄûÀµ¡£
+         open_inbox_on_inc ¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¤È¤­¡¢¼õ¿®Ãæ¤Ë¥µ¥Þ¥ê¥Ó¥å¡¼¤ò
+         ¥ê¥Õ¥ì¥Ã¥·¥å¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+
 2002-09-10
 
        * src/summaryview.c: summary_show(): open_inbox_on_inc ¤¬¥»¥Ã¥È
index df7b33a..ed7561c 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws37
+EXTRA_VERSION=claws38
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 5ec3804..ce006be 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -187,8 +187,11 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
                if (new_msgs <= 0)
                        new_msgs = 1;
        } else {
-               if (prefs_common.inc_local)
+               if (prefs_common.inc_local) {
                        new_msgs = inc_spool();
+                       if (new_msgs < 0)
+                               new_msgs = 0;
+               }
 
                new_msgs += inc_account_mail(cur_account, mainwin);
        }
@@ -593,7 +596,8 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                if (!prefs_common.scan_all_after_inc) {
                        folder_item_scan_foreach(session->folder_table);
                        folderview_update_item_foreach
-                               (session->folder_table, TRUE);
+                               (session->folder_table,
+                                !prefs_common.open_inbox_on_inc);
                }
 
                if (pop3_state->error_val == PS_AUTHFAIL &&
@@ -1161,7 +1165,8 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
                if (!prefs_common.scan_all_after_inc) {
                g_hash_table_insert(folder_table, dest,
                                    GINT_TO_POINTER(1));
-                       folderview_update_item_foreach(folder_table, TRUE);
+                       folderview_update_item_foreach
+                               (folder_table, !prefs_common.open_inbox_on_inc);
                }
                g_hash_table_destroy(folder_table);
        } else if (!prefs_common.scan_all_after_inc) {