[Commits] [SCM] claws branch, master, updated. 3.13.0-48-ge6e7695

[ticho at claws-mail.org]

The branch, master has been updated
       via  e6e769570534a85a35a5201ffa0b74149904539c (commit)
      from  a5304d00b20f8b6845b54f5833cdd2d3c067dc42 (commit)

Summary of changes:
 src/imap.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit e6e769570534a85a35a5201ffa0b74149904539c
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Wed Nov 11 21:15:24 2015 +0100

    Let imap_get_num_list() unlock the session itself.
    
    Instead of leaving it to another function it calls.

diff --git a/src/imap.c b/src/imap.c
index 76d1dbd..985d65b 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -4546,8 +4546,6 @@ static gint get_list_of_uids(IMAPSession *session, Folder *folder, IMAPFolderIte
 	}
 	g_slist_free(uidlist);
 
-	unlock_session(session); /* locked from imap_get_num_list */
-
 	return nummsgs;
 
 }
@@ -4602,7 +4600,7 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
 	session = imap_session_get(folder);
 	g_return_val_if_fail(session != NULL, -1);
 
-	lock_session(session); /* unlocked by get_list_of_uids */
+	lock_session(session);
 	if (FOLDER_ITEM(item)->path) 
 		statusbar_print_all(_("Scanning folder %s%c%s..."),
 				      FOLDER_ITEM(item)->folder->name, 
@@ -4627,6 +4625,9 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
 	}
 
 	nummsgs = get_list_of_uids(session, folder, item, &uidlist);
+
+	unlock_session(session);
+
 	/* session could be broken now, in case of fatal error */
 
 	debug_print("get_num_list: got %d msgs\n", nummsgs);

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


hooks/post-receive
-- 
Claws Mail