[Commits] [SCM] claws branch, master, updated. 3.10.1-64-g41d7fd7

[Colin]

The branch master of project "claws" (Claws Mail) has been updated
       via  41d7fd747504c2167a6bb0bb9c07b81c35302812 (commit)
      from  dfb5e223b87b1d6b2f0ca050f9456fd86cfacb35 (commit)

Summary of changes:
 src/imap.c |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 41d7fd747504c2167a6bb0bb9c07b81c35302812
Author: Colin Leroy <colin at colino.net>
Date:   Mon Jun 16 17:26:59 2014 +0200

    Finish fixing bug #3212 (case where the folder exists, but is uncached
    and a mail with the same number is cached).

diff --git a/src/imap.c b/src/imap.c
index 421b24b..00c1763 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1497,8 +1497,11 @@ static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
 		return NULL;
 
 	path = folder_item_get_path(item);
-	if (!is_dir_exist(path))
+	if (!is_dir_exist(path)) {
+		if(is_file_exist(path))
+			claws_unlink(path);
 		make_dir_hier(path);
+	}
 	g_free(path);
 
 	filename = imap_get_cached_filename(item, uid);
@@ -4522,6 +4525,8 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
 	GSList *uidlist = NULL;
 	gchar *dir;
 	gint known_list_len = 0;
+	gchar *path;
+
 	debug_print("get_num_list\n");
 	
 	g_return_val_if_fail(folder != NULL, -1);
@@ -4550,6 +4555,14 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
 		return -1;
 	}
 	
+	path = folder_item_get_path(_item);
+	if (!is_dir_exist(path)) {
+		if(is_file_exist(path))
+			claws_unlink(path);
+		make_dir_hier(path);
+	}
+	g_free(path);
+
 	debug_print("getting session...\n");
 	session = imap_session_get(folder);
 	g_return_val_if_fail(session != NULL, -1);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail