Fix wrong binary logic
[claws.git] / src / procheader.c
index 8d4ef4a7f71e4da36a5e3ee234072718a16c1b1f..330a3107a0d8f4adb1ce3a1a1b6a51b189b2f209 100644 (file)
@@ -38,7 +38,9 @@
 #include "procmsg.h"
 #include "codeconv.h"
 #include "prefs_common.h"
+#include "hooks.h"
 #include "utils.h"
+#include "defs.h"
 
 #define BUFFSIZE       8192
 
@@ -284,7 +286,7 @@ static gboolean header_is_addr_field(const gchar *hdr)
 
 Header * procheader_parse_header(gchar * buf)
 {
-       gchar *p = buf;
+       gchar *p;
        Header * header;
        gboolean addr_field = FALSE;
 
@@ -370,38 +372,39 @@ MsgInfo *procheader_parse_str(const gchar *str, MsgFlags flags, gboolean full,
 
 enum
 {
-       H_DATE          = 0,
-       H_FROM          = 1,
-       H_TO            = 2,
-       H_CC            = 3,
-       H_NEWSGROUPS    = 4,
-       H_SUBJECT       = 5,
-       H_MSG_ID        = 6,
-       H_REFERENCES    = 7,
-       H_IN_REPLY_TO   = 8,
-       H_CONTENT_TYPE  = 9,
-       H_SEEN          = 10,
-       H_STATUS        = 11,
-       H_X_STATUS      = 12,
-       H_FROM_SPACE    = 13,
-       H_SC_PLANNED_DOWNLOAD = 14,
-       H_SC_MESSAGE_SIZE = 15,
-       H_FACE          = 16,
-       H_X_FACE        = 17,
-       H_DISPOSITION_NOTIFICATION_TO = 18,
-       H_RETURN_RECEIPT_TO = 19,
-       H_SC_PARTIALLY_RETRIEVED = 20,
-       H_SC_ACCOUNT_SERVER = 21,
-       H_SC_ACCOUNT_LOGIN = 22,
-       H_LIST_POST        = 23,
-       H_LIST_SUBSCRIBE   = 24,
-       H_LIST_UNSUBSCRIBE = 25,
-       H_LIST_HELP        = 26,
-       H_LIST_ARCHIVE     = 27,
-       H_LIST_OWNER       = 28,
+       H_DATE = 0,
+       H_FROM,
+       H_TO,
+       H_CC,
+       H_NEWSGROUPS,
+       H_SUBJECT,
+       H_MSG_ID,
+       H_REFERENCES,
+       H_IN_REPLY_TO,
+       H_CONTENT_TYPE,
+       H_SEEN,
+       H_STATUS,
+       H_FROM_SPACE,
+       H_SC_PLANNED_DOWNLOAD,
+       H_SC_MESSAGE_SIZE,
+       H_FACE,
+       H_X_FACE,
+       H_DISPOSITION_NOTIFICATION_TO,
+       H_RETURN_RECEIPT_TO,
+       H_SC_PARTIALLY_RETRIEVED,
+       H_SC_ACCOUNT_SERVER,
+       H_SC_ACCOUNT_LOGIN,
+       H_LIST_POST,
+       H_LIST_SUBSCRIBE,
+       H_LIST_UNSUBSCRIBE,
+       H_LIST_HELP,
+       H_LIST_ARCHIVE,
+       H_LIST_OWNER,
+       H_RESENT_FROM,
 };
 
-static HeaderEntry hentry_full[] = {{"Date:",          NULL, FALSE},
+static HeaderEntry hentry_full[] = {
+                                  {"Date:",            NULL, FALSE},
                                   {"From:",            NULL, TRUE},
                                   {"To:",              NULL, TRUE},
                                   {"Cc:",              NULL, TRUE},
@@ -413,7 +416,6 @@ static HeaderEntry hentry_full[] = {{"Date:",               NULL, FALSE},
                                   {"Content-Type:",    NULL, FALSE},
                                   {"Seen:",            NULL, FALSE},
                                   {"Status:",          NULL, FALSE},
-                                  {"X-Status:",        NULL, FALSE},
                                   {"From ",            NULL, FALSE},
                                   {"SC-Marked-For-Download:", NULL, FALSE},
                                   {"SC-Message-Size:", NULL, FALSE},
@@ -430,9 +432,11 @@ static HeaderEntry hentry_full[] = {{"Date:",              NULL, FALSE},
                                   {"List-Help:",       NULL, TRUE},
                                   {"List-Archive:",    NULL, TRUE},
                                   {"List-Owner:",      NULL, TRUE},
+                                  {"Resent-From:",     NULL, TRUE},
                                   {NULL,               NULL, FALSE}};
 
-static HeaderEntry hentry_short[] = {{"Date:",         NULL, FALSE},
+static HeaderEntry hentry_short[] = {
+                                   {"Date:",           NULL, FALSE},
                                    {"From:",           NULL, TRUE},
                                    {"To:",             NULL, TRUE},
                                    {"Cc:",             NULL, TRUE},
@@ -444,7 +448,6 @@ static HeaderEntry hentry_short[] = {{"Date:",              NULL, FALSE},
                                    {"Content-Type:",   NULL, FALSE},
                                    {"Seen:",           NULL, FALSE},
                                    {"Status:",         NULL, FALSE},
-                                   {"X-Status:",       NULL, FALSE},
                                    {"From ",           NULL, FALSE},
                                    {"SC-Marked-For-Download:", NULL, FALSE},
                                    {"SC-Message-Size:",NULL, FALSE},
@@ -461,6 +464,28 @@ MsgInfo *procheader_parse_stream(FILE *fp, MsgFlags flags, gboolean full,
        return parse_stream(fp, FALSE, flags, full, decrypted);
 }
 
+static gboolean avatar_from_some_face(gpointer source, gpointer userdata)
+{
+       AvatarCaptureData *acd = (AvatarCaptureData *)source;
+       
+       if (*(acd->content) == '\0') /* won't be null, but may be empty */
+               return FALSE;
+
+       if (!strcmp(acd->header, hentry_full[H_FACE].name)) {
+               debug_print("avatar_from_some_face: found 'Face' header\n");
+               procmsg_msginfo_add_avatar(acd->msginfo, AVATAR_FACE, acd->content);
+       }
+#if HAVE_LIBCOMPFACE
+       else if (!strcmp(acd->header, hentry_full[H_X_FACE].name)) {
+               debug_print("avatar_from_some_face: found 'X-Face' header\n");
+               procmsg_msginfo_add_avatar(acd->msginfo, AVATAR_XFACE, acd->content);
+       }
+#endif
+       return FALSE;
+}
+
+static guint avatar_hook_id = 0;
+
 static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
                             gboolean full, gboolean decrypted)
 {
@@ -508,6 +533,13 @@ 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)) {
+               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)) {
+               hooks_unregister_hook(AVATAR_HEADER_UPDATE_HOOKLIST, avatar_hook_id);
+               avatar_hook_id = 0;
+       }
+
        while ((hnum = get_one_field(buf, sizeof(buf), data, hentry))
               != -1) {
                hp = buf + strlen(hentry[hnum].name);
@@ -608,24 +640,6 @@ static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
                        if (!g_ascii_strncasecmp(hp, "multipart/", 10))
                                MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MULTIPART);
                        break;
-#ifdef ALLOW_HEADER_HINT                       
-               case H_SEEN:
-                       /* mnews Seen header */
-                       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW|MSG_UNREAD);
-                       break;
-#endif                 
-               case H_FACE:
-                       if (!msginfo->extradata)
-                               msginfo->extradata = g_new0(MsgInfoExtraData, 1);
-                       if (msginfo->extradata->face) break;
-                       msginfo->extradata->face = g_strdup(hp);
-                       break;
-               case H_X_FACE:
-                       if (!msginfo->extradata)
-                               msginfo->extradata = g_new0(MsgInfoExtraData, 1);
-                       if (msginfo->extradata->xface) break;
-                       msginfo->extradata->xface = g_strdup(hp);
-                       break;
                case H_DISPOSITION_NOTIFICATION_TO:
                        if (!msginfo->extradata)
                                msginfo->extradata = g_new0(MsgInfoExtraData, 1);
@@ -665,29 +679,6 @@ static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
                        msginfo->planned_download = atoi(hp);
                        break;
 /* end partial download infos */
-#ifdef ALLOW_HEADER_HINT                       
-               case H_STATUS:
-                       if (strchr(hp, 'R') != NULL)
-                               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
-                       if (strchr(hp, 'O') != NULL)
-                               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW);
-                       if (strchr(hp, 'U') != NULL)
-                               MSG_SET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
-                       break;
-               case H_X_STATUS:
-                       if (strchr(hp, 'D') != NULL)
-                               MSG_SET_PERM_FLAGS(msginfo->flags,
-                                             MSG_REALLY_DELETED);
-                       if (strchr(hp, 'F') != NULL)
-                               MSG_SET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
-                       if (strchr(hp, 'd') != NULL)
-                               MSG_SET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
-                       if (strchr(hp, 'r') != NULL)
-                               MSG_SET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
-                       if (strchr(hp, 'f') != NULL)
-                               MSG_SET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
-                       break;
-#endif                 
                case H_FROM_SPACE:
                        if (msginfo->fromspace) break;
                        msginfo->fromspace = g_strdup(hp);
@@ -730,10 +721,28 @@ static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
                        if (msginfo->extradata->list_owner) break;
                        msginfo->extradata->list_owner = g_strdup(hp);
                        break;
+               case H_RESENT_FROM:
+                       if (!msginfo->extradata)
+                               msginfo->extradata = g_new0(MsgInfoExtraData, 1);
+                       if (msginfo->extradata->resent_from) break;
+                       msginfo->extradata->resent_from = g_strdup(hp);
+                       break;
 /* end list infos */
                default:
                        break;
                }
+               /* to avoid performance penalty hooklist is invoked only for
+                  headers known to be able to generate avatars */
+               if (hnum == H_FROM || hnum == H_X_FACE || hnum == H_FACE) {
+                       AvatarCaptureData *acd = g_new0(AvatarCaptureData, 1);
+                       /* no extra memory is wasted, hooks are expected to
+                          take care of copying members when needed */
+                       acd->msginfo = msginfo;
+                       acd->header  = hentry_full[hnum].name;
+                       acd->content = hp;
+                       hooks_invoke(AVATAR_HEADER_UPDATE_HOOKLIST, (gpointer)acd);
+                       g_free(acd);
+               }
        }
 
        if (!msginfo->inreplyto && msginfo->references)