[Commits] [SCM] claws branch, master, updated. 3.12.0-42-gb4582ca

[Colin]

The branch, master has been updated
       via  b4582cad28c37972af381447a8580a51acffaa3d (commit)
       via  9693e93d08f21661bd6ceb63e687f7ee8687300d (commit)
      from  200a466aad1859b890283e959c715c279f04373c (commit)

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


- Log -----------------------------------------------------------------
commit b4582cad28c37972af381447a8580a51acffaa3d
Merge: 9693e93 200a466
Author: Colin Leroy <colin at colino.net>
Date:   Tue Aug 4 12:34:37 2015 +0200

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 9693e93d08f21661bd6ceb63e687f7ee8687300d
Author: Colin Leroy <colin at colino.net>
Date:   Tue Aug 4 11:01:04 2015 +0200

    Fix bug #3352, "found_in_addressbook matches entries from GPG keyring"
    Only include GPG keyring in autocompletion when we're not completing
    on a specific addressbook.

diff --git a/src/addr_compl.c b/src/addr_compl.c
index ad1840b..44303a6 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -386,7 +386,9 @@ static void read_address_book(gchar *folderpath) {
 	}
 #endif
 	/* plugins may hook in here to modify/extend the completion list */
-	hooks_invoke(ADDDRESS_COMPLETION_BUILD_ADDRESS_LIST_HOOKLIST, &g_address_list);
+	if(!folderpath) {
+		hooks_invoke(ADDDRESS_COMPLETION_BUILD_ADDRESS_LIST_HOOKLIST, &g_address_list);
+	}
 
 	g_address_list = g_list_reverse(g_address_list);
 	g_completion_list = g_list_reverse(g_completion_list);

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


hooks/post-receive
-- 
Claws Mail