[Commits] [SCM] claws branch, master, updated. 3.10.0-56-g494eff5

[Colin]

The branch master of project "claws" (Claws Mail) has been updated
       via  494eff54d1138b567e371dd5e5f27e85844ada20 (commit)
      from  8e7225406c2fe85c01c65973d12d64372d935a59 (commit)


- Log -----------------------------------------------------------------
commit 494eff54d1138b567e371dd5e5f27e85844ada20
Author: Colin Leroy <colin at colino.net>
Date:   Thu Jun 5 17:15:18 2014 +0200

    Fix wrong binary logic

diff --git a/src/avatars.c b/src/avatars.c
index a68286d..b6177b1 100644
--- a/src/avatars.c
+++ b/src/avatars.c
@@ -60,7 +60,7 @@ gboolean avatars_internal_rendering_hook(gpointer source, gpointer data)
 	AvatarRender *avatarr = (AvatarRender *)source;
 	gchar *aface;
 
-	if (!(prefs_common.enable_avatars | AVATARS_ENABLE_RENDER)) {
+	if (!(prefs_common.enable_avatars & AVATARS_ENABLE_RENDER)) {
 		debug_print("Internal rendering of avatars is disabled");
 		return FALSE;
 	}
diff --git a/src/procheader.c b/src/procheader.c
index fad05e1..330a310 100644
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -533,9 +533,9 @@ static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
 	
 	msginfo->inreplyto = NULL;
 
-	if (avatar_hook_id == 0 && (prefs_common.enable_avatars | AVATARS_ENABLE_CAPTURE)) {
+	if (avatar_hook_id == 0 && (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 != 0 && !(prefs_common.enable_avatars | AVATARS_ENABLE_CAPTURE)) {
+	} else if (avatar_hook_id != 0 && !(prefs_common.enable_avatars & AVATARS_ENABLE_CAPTURE)) {
 		hooks_unregister_hook(AVATAR_HEADER_UPDATE_HOOKLIST, avatar_hook_id);
 		avatar_hook_id = 0;
 	}

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

Summary of changes:
 src/avatars.c    |    2 +-
 src/procheader.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Claws Mail