remove flag conflict

diff --git a/src/procmsg.h b/src/procmsg.h
index 7dbc1340e3e76e4eb7232a5b72deaab2c37abaa6..5afe3f623937364ff5a8a6b1a808065228184d9f 100644 (file)
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -41,20 +41,20 @@ typedef enum
        MSG_FORWARDED   = 1 << 5,
        MSG_REALLY_DELETED = 1 << 6,
 
+       MSG_LABEL         = 1 << 9 | 1 << 8 | 1 << 7,
+       MSG_LABEL_NONE    = 0 << 9 | 0 << 8 | 0 << 7,
+       MSG_LABEL_ORANGE  = 0 << 9 | 0 << 8 | 1 << 7,
+       MSG_LABEL_RED     = 0 << 9 | 1 << 8 | 0 << 7,
+       MSG_LABEL_PINK    = 0 << 9 | 1 << 8 | 1 << 7,
+       MSG_LABEL_SKYBLUE = 1 << 9 | 0 << 8 | 0 << 7,
+       MSG_LABEL_BLUE    = 1 << 9 | 0 << 8 | 1 << 7,
+       MSG_LABEL_GREEN   = 1 << 9 | 1 << 8 | 0 << 7,
+       MSG_LABEL_BROWN   = 1 << 9 | 1 << 8 | 1 << 7,
+
        /* temporary flags (0xffff0000) */
        MSG_MOVE        = 1 << 16,
        MSG_COPY        = 1 << 17,
 
-       MSG_LABEL         = 1 << 8 | 1 << 7 | 1 << 6,
-       MSG_LABEL_NONE    = 0 << 8 | 0 << 7 | 0 << 6,
-       MSG_LABEL_ORANGE  = 0 << 8 | 0 << 7 | 1 << 6,
-       MSG_LABEL_RED     = 0 << 8 | 1 << 7 | 0 << 6,
-       MSG_LABEL_PINK    = 0 << 8 | 1 << 7 | 1 << 6,
-       MSG_LABEL_SKYBLUE = 1 << 8 | 0 << 7 | 0 << 6,
-       MSG_LABEL_BLUE    = 1 << 8 | 0 << 7 | 1 << 6,
-       MSG_LABEL_GREEN   = 1 << 8 | 1 << 7 | 0 << 6,
-       MSG_LABEL_BROWN   = 1 << 8 | 1 << 7 | 1 << 6,
-
        MSG_QUEUED      = 1 << 25,
        MSG_DRAFT       = 1 << 26,
        MSG_ENCRYPTED   = 1 << 27,
@@ -71,7 +71,8 @@ typedef enum
                                         MSG_REPLIED   | \
                                         MSG_FORWARDED | \
                                          MSG_LABEL     | \
-                                         MSG_REALLY_DELETED)
+                                         MSG_REALLY_DELETED | \
+                                        MSG_IGNORE_THREAD)
 #define MSG_CACHED_FLAG_MASK           (MSG_MIME)
 
 #define MSG_SET_FLAGS(msg, flags)      { (msg) |= (flags); }
@@ -94,7 +95,7 @@ typedef enum
 #define MSG_IS_MIME(msg)               ((msg & MSG_MIME) != 0)
 #define MSG_IS_NEWS(msg)               ((msg & MSG_NEWS) != 0)
 #define MSG_IS_CACHED(msg)             ((msg & MSG_CACHED) != 0)
-
+#define MSG_IS_IGNORE_THREAD(msg)      ((msg & MSG_IGNORE_THREAD) != 0)
 #define MSG_GET_LABEL(msg)             (msg & MSG_LABEL)
 
 #define WRITE_CACHE_DATA_INT(n, fp) \