sync with 0.8.2cvs13

diff --git a/ChangeLog b/ChangeLog
index 954560cf8e74a8235e0ef501a6ad00e3e8f00dbd..8588edc3a91c6648b2b4d9895c287b5d290a5331 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * src/summaryview.c: summary_show(): refresh even if open_inbox_on_inc
          is set (to avoid summary refresh problem).
+       * src/imap.c: removed warnings by checking the existence of directory
+         before calling remove*_numbered_files().
 
 2002-09-06
 

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8e5d00006c21c850b0c6cc0f232c301adbfeaf0e..9269b8c50cac31e98a0371b9ec2568997843dde6 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-09-10 [paul]      0.8.2claws34
+
+       * sync with 0.8.2cvs13
+               see ChangeLog 2002-09-10
+
 2002-09-10 [christoph] 0.8.2claws33
 
        * src/msgcache.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index b8b8bbb056f41d70087b9dfa0afa39e6e86b9cbd..2cf3120c009690961a65d2e2efc373a7e1c73d1e 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -3,6 +3,8 @@
        * src/summaryview.c: summary_show(): open_inbox_on_inc ¤¬¥»¥Ã¥È
          ¤µ¤ì¤Æ¤¤¤Æ¤â¥ê¥Õ¥ì¥Ã¥·¥å¤¹¤ë¤è¤¦¤Ë¤·¤¿(¥µ¥Þ¥ê¤Î¥ê¥Õ¥ì¥Ã¥·¥å¤Î
          ÌäÂê¤òËɤ°¤¿¤á)¡£
+       * src/imap.c: remove*_numbered_files() ¤ò¸Æ¤ÖÁ°¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤Î
+         ¸ºß¤ò¥Á¥§¥Ã¥¯¤·¤Æ·Ù¹ð¤ò½üµî¡£
 
 2002-09-06
 

diff --git a/configure.in b/configure.in
index 872c9c80dd04c4968d6120abc688a8bfd28bf1a9..3de517d72ae80b6f422e568792ebb6afd1d0520c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws33
+EXTRA_VERSION=claws34
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/imap.c b/src/imap.c
index 46cc236aafd2fd90700a7d155127ec36eff48424..7ae80f2dd9f91e17b210a64d284f3d572437bc5b 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -994,7 +994,8 @@ gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid)
        }
 
        dir = folder_item_get_path(item);
-       remove_numbered_files(dir, uid, uid);
+       if (is_dir_exist(dir))
+               remove_numbered_files(dir, uid, uid);
        g_free(dir);
 
        return IMAP_SUCCESS;
@@ -1039,7 +1040,8 @@ gint imap_remove_all_msg(Folder *folder, FolderItem *item)
        }
 
        dir = folder_item_get_path(item);
-       remove_all_numbered_files(dir);
+       if (is_dir_exist(dir))
+               remove_all_numbered_files(dir);
        g_free(dir);
 
        return IMAP_SUCCESS;
@@ -1663,7 +1665,8 @@ static GSList *imap_delete_cached_messages(GSList *mlist, FolderItem *item,
                    first_uid, last_uid);
 
        dir = folder_item_get_path(item);
-       remove_numbered_files(dir, first_uid, last_uid);
+       if (is_dir_exist(dir))
+               remove_numbered_files(dir, first_uid, last_uid);
        g_free(dir);
 
        for (cur = mlist; cur != NULL; ) {
@@ -1695,7 +1698,8 @@ static void imap_delete_all_cached_messages(FolderItem *item)
        debug_print("Deleting all cached messages...\n");
 
        dir = folder_item_get_path(item);
-       remove_all_numbered_files(dir);
+       if (is_dir_exist(dir))
+               remove_all_numbered_files(dir);
        g_free(dir);
 
        debug_print("done.\n");