From: Colin Leroy <colin@colino.net>
Date: Thu, 5 Jun 2014 15:15:18 +0000 (+0200)
Subject: Fix wrong binary logic
X-Git-Tag: 3.10.1~21
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=494eff54d1138b567e371dd5e5f27e85844ada20;ds=sidebyside

Fix wrong binary logic
---

diff --git a/src/avatars.c b/src/avatars.c
index a68286d85..b6177b190 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 fad05e1bf..330a3107a 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;
 	}