talons

commit 9693e93d08f21661bd6ceb63e687f7ee8687300d
parent 8d1abd7c17753de5498dd429d5897128ea0e34a9
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  4 Aug 2015 11:01:04 +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.

Diffstat:
M
src/addr_compl.c
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git 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);