From 2bdfb1159d56304c00b69e6c37288d39ba4953ea Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sat, 13 Aug 2011 01:59:02 +0300 Subject: [PATCH] * mu-flags.[ch]: small updates --- src/mu-flags.c | 10 ++-------- src/mu-flags.h | 10 ++++------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/mu-flags.c b/src/mu-flags.c index ac502051..d4fc08fd 100644 --- a/src/mu-flags.c +++ b/src/mu-flags.c @@ -38,9 +38,8 @@ static const FlagInfo FLAG_INFO[] = { { MU_FLAG_SEEN, 'S', "seen", MU_FLAG_TYPE_MAILFILE }, { MU_FLAG_TRASHED, 'T', "trashed", MU_FLAG_TYPE_MAILFILE }, - { MU_FLAG_NEW, 'N', "new", MU_FLAG_TYPE_MAILDIR }, - { MU_FLAG_UNREAD, 'U', "unread", MU_FLAG_TYPE_PSEUDO }, - + { MU_FLAG_NEW, 'N', "new", MU_FLAG_TYPE_MAILDIR }, + { MU_FLAG_SIGNED, 's', "signed", MU_FLAG_TYPE_CONTENT }, { MU_FLAG_ENCRYPTED, 'x', "encrypted", MU_FLAG_TYPE_CONTENT }, { MU_FLAG_HAS_ATTACH, 'a', "attach", MU_FLAG_TYPE_CONTENT } @@ -54,8 +53,6 @@ mu_flag_type (MuFlags flag) return MU_FLAG_TYPE_MAILFILE; if (flag == MU_FLAG_NEW) return MU_FLAG_TYPE_MAILDIR; - if (flag == MU_FLAG_UNREAD) - return MU_FLAG_TYPE_PSEUDO; if (flag >= MU_FLAG_SIGNED && flag <= MU_FLAG_HAS_ATTACH) return MU_FLAG_TYPE_CONTENT; @@ -77,7 +74,6 @@ mu_flag_char (MuFlags flag) case MU_FLAG_TRASHED: return 'T'; case MU_FLAG_NEW: return 'N'; - case MU_FLAG_UNREAD: return 'U'; case MU_FLAG_SIGNED: return 's'; case MU_FLAG_ENCRYPTED: return 'x'; @@ -105,7 +101,6 @@ mu_flag_from_char (char kar) case 'T': return MU_FLAG_TRASHED; case 'N': return MU_FLAG_NEW; - case 'U': return MU_FLAG_UNREAD; case 's': return MU_FLAG_SIGNED; case 'x': return MU_FLAG_ENCRYPTED; @@ -133,7 +128,6 @@ mu_flag_name (MuFlags flag) case MU_FLAG_TRASHED: return "trashed"; case MU_FLAG_NEW: return "new"; - case MU_FLAG_UNREAD: return "unread"; case MU_FLAG_SIGNED: return "signed"; case MU_FLAG_ENCRYPTED: return "encrypted"; diff --git a/src/mu-flags.h b/src/mu-flags.h index ac08d57c..7dab13fa 100644 --- a/src/mu-flags.h +++ b/src/mu-flags.h @@ -36,10 +36,9 @@ enum _MuFlags { MU_FLAG_TRASHED = 1 << 5, MU_FLAG_NEW = 1 << 6, - MU_FLAG_UNREAD = 1 << 7, - MU_FLAG_SIGNED = 1 << 8, - MU_FLAG_ENCRYPTED = 1 << 9, - MU_FLAG_HAS_ATTACH = 1 << 10, + MU_FLAG_SIGNED = 1 << 7, + MU_FLAG_ENCRYPTED = 1 << 8, + MU_FLAG_HAS_ATTACH = 1 << 9 }; typedef enum _MuFlags MuFlags; @@ -48,8 +47,7 @@ typedef enum _MuFlags MuFlags; enum _MuFlagType { MU_FLAG_TYPE_MAILFILE = 1 << 0, MU_FLAG_TYPE_MAILDIR = 1 << 1, - MU_FLAG_TYPE_PSEUDO = 1 << 2, - MU_FLAG_TYPE_CONTENT = 1 << 3, + MU_FLAG_TYPE_CONTENT = 1 << 2 }; typedef enum _MuFlagType MuFlagType;