Unmark some warnings from translations

[claws.git] / src / avatars.c

diff --git a/src/avatars.c b/src/avatars.c
index 51acba42e34c5b2bbeb2880a77e0b094c3d23cb4..e940b4322531f9e1bd993fbba7549dd7faad1c7c 100644 (file)
--- a/src/avatars.c
+++ b/src/avatars.c
@@ -39,6 +39,7 @@ AvatarRender *avatars_avatarrender_new(MsgInfo *msginfo)
        AvatarRender *ar = g_new0(AvatarRender, 1);
        ar->full_msginfo = msginfo;
        ar->image = NULL;
+       ar->type = 0;
 
        return ar;
 }
@@ -59,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;
        }
@@ -76,12 +77,14 @@ gboolean avatars_internal_rendering_hook(gpointer source, gpointer data)
        aface = procmsg_msginfo_get_avatar(avatarr->full_msginfo, AVATAR_FACE);
        if (aface) {
                avatarr->image = face_get_from_header(aface);
+               avatarr->type  = AVATAR_FACE;
        }
 #if HAVE_LIBCOMPFACE
        else {
                aface = procmsg_msginfo_get_avatar(avatarr->full_msginfo, AVATAR_XFACE);
                if (aface) {
                        avatarr->image = xface_get_from_header(aface);
+                       avatarr->type  = AVATAR_XFACE;
                }
        }
 #endif
@@ -91,7 +94,7 @@ gboolean avatars_internal_rendering_hook(gpointer source, gpointer data)
 void avatars_init(void)
 {
        if (avatar_render_hook_id != -1) {
-               g_warning(_("Internal avatars rendering already initialized"));
+               g_warning("Internal avatars rendering already initialized");
                return;
        }
        avatar_render_hook_id = hooks_register_hook(AVATAR_IMAGE_RENDER_HOOKLIST, avatars_internal_rendering_hook, NULL);