[Commits] [SCM] claws branch, master, updated. 3.17.8-89-g4fa6bcc24

[paul at claws-mail.org]

The branch, master has been updated
       via  4fa6bcc24a19c4e6c17ce6539d7ad9f246ed80e7 (commit)
      from  2971689468763497744ecba90cf1a2dc30fd4348 (commit)

Summary of changes:
 src/procheader.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 4fa6bcc24a19c4e6c17ce6539d7ad9f246ed80e7
Author: paul <paul at claws-mail.org>
Date:   Sat Jul 3 13:52:10 2021 +0100

    fix non-display of (X-)Face when prefs_common.enable_avatars is AVATARS_ENABLE_RENDER (2)

diff --git a/src/procheader.c b/src/procheader.c
index f5755b6a3..864651af7 100644
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -663,9 +663,12 @@ static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
 	
 	msginfo->inreplyto = NULL;
 
-	if (avatar_hook_id == HOOK_NONE && (prefs_common.enable_avatars & AVATARS_ENABLE_CAPTURE)) {
-		avatar_hook_id = hooks_register_hook(AVATAR_HEADER_UPDATE_HOOKLIST, avatar_from_some_face, NULL);
-	} else if (avatar_hook_id != HOOK_NONE && !(prefs_common.enable_avatars & AVATARS_ENABLE_CAPTURE)) {
+	if (avatar_hook_id == HOOK_NONE &&
+	    (prefs_common.enable_avatars && (AVATARS_ENABLE_CAPTURE || AVATARS_ENABLE_RENDER))) {
+		avatar_hook_id = hooks_register_hook(AVATAR_HEADER_UPDATE_HOOKLIST,
+						     avatar_from_some_face, NULL);
+	} else if (avatar_hook_id != HOOK_NONE &&
+		   !(prefs_common.enable_avatars && AVATARS_ENABLE_CAPTURE)) {
 		hooks_unregister_hook(AVATAR_HEADER_UPDATE_HOOKLIST, avatar_hook_id);
 		avatar_hook_id = HOOK_NONE;
 	}

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


hooks/post-receive
-- 
Claws Mail