* mu-msg-flags.[ch]: minor

This commit is contained in:
Dirk-Jan C. Binnema 2010-11-21 13:39:43 +02:00
parent 63f06e756e
commit e9d6540b1f
2 changed files with 43 additions and 41 deletions

View File

@ -24,39 +24,42 @@
#include "mu-msg-flags.h" #include "mu-msg-flags.h"
/* put these in alpha-order, so output strings are ordered thusly
* note, these should be in lower-case, otherwise Xapian gets
* confused...
*/
static const MuMsgFlags ALL_FLAGS[] = { static const MuMsgFlags ALL_FLAGS[] = {
MU_MSG_FLAG_NEW, /* a */ MU_MSG_FLAG_HAS_ATTACH,
MU_MSG_FLAG_PASSED, /* d */ MU_MSG_FLAG_DRAFT,
MU_MSG_FLAG_REPLIED, /* f */ MU_MSG_FLAG_FLAGGED,
MU_MSG_FLAG_SEEN, /* n */ MU_MSG_FLAG_NEW,
MU_MSG_FLAG_TRASHED, /* p */ MU_MSG_FLAG_PASSED,
MU_MSG_FLAG_DRAFT, /* r */ MU_MSG_FLAG_REPLIED,
MU_MSG_FLAG_FLAGGED, /* s */ MU_MSG_FLAG_SEEN,
MU_MSG_FLAG_SIGNED, /* t */ MU_MSG_FLAG_TRASHED,
MU_MSG_FLAG_ENCRYPTED, /* x */ MU_MSG_FLAG_ENCRYPTED,
MU_MSG_FLAG_HAS_ATTACH /* z */ MU_MSG_FLAG_SIGNED
}; };
MuMsgFlags MuMsgFlags
mu_msg_flag_from_char (char k) mu_msg_flag_from_char (char k)
{ {
switch (k) { switch (g_ascii_tolower(k)) {
case 'N': return MU_MSG_FLAG_NEW; case 'n': return MU_MSG_FLAG_NEW;
case 'P': return MU_MSG_FLAG_PASSED; case 'p': return MU_MSG_FLAG_PASSED;
case 'R': return MU_MSG_FLAG_REPLIED; case 'r': return MU_MSG_FLAG_REPLIED;
case 'S': return MU_MSG_FLAG_SEEN; case 's': return MU_MSG_FLAG_SEEN;
case 'T': return MU_MSG_FLAG_TRASHED; case 't': return MU_MSG_FLAG_TRASHED;
case 'D': return MU_MSG_FLAG_DRAFT; case 'd': return MU_MSG_FLAG_DRAFT;
case 'F': return MU_MSG_FLAG_FLAGGED; case 'f': return MU_MSG_FLAG_FLAGGED;
case 'Z': return MU_MSG_FLAG_SIGNED; case 'z': return MU_MSG_FLAG_SIGNED;
case 'X': return MU_MSG_FLAG_ENCRYPTED; case 'x': return MU_MSG_FLAG_ENCRYPTED;
case 'A': return MU_MSG_FLAG_HAS_ATTACH; case 'a': return MU_MSG_FLAG_HAS_ATTACH;
default: default:
g_warning ("%s: unknown flag %c", __FUNCTION__, k); g_return_val_if_reached (MU_MSG_FLAG_NONE);
return MU_MSG_FLAG_NONE;
} }
} }
@ -78,8 +81,7 @@ mu_msg_flag_to_name (MuMsgFlags flag)
case MU_MSG_FLAG_HAS_ATTACH: return "attach"; case MU_MSG_FLAG_HAS_ATTACH: return "attach";
default: default:
g_warning ("%s: unknown flag 0x%x", __FUNCTION__, flag); g_return_val_if_reached (NULL);
return 0;
} }
} }
@ -87,21 +89,20 @@ char
mu_msg_flag_char (MuMsgFlags flag) mu_msg_flag_char (MuMsgFlags flag)
{ {
switch (flag) { switch (flag) {
case MU_MSG_FLAG_NEW: return 'N'; case MU_MSG_FLAG_NEW: return 'n';
case MU_MSG_FLAG_PASSED: return 'P'; case MU_MSG_FLAG_PASSED: return 'p';
case MU_MSG_FLAG_REPLIED: return 'R'; case MU_MSG_FLAG_REPLIED: return 'r';
case MU_MSG_FLAG_SEEN: return 'S'; case MU_MSG_FLAG_SEEN: return 's';
case MU_MSG_FLAG_TRASHED: return 'T'; case MU_MSG_FLAG_TRASHED: return 't';
case MU_MSG_FLAG_DRAFT: return 'D'; case MU_MSG_FLAG_DRAFT: return 'd';
case MU_MSG_FLAG_FLAGGED: return 'F'; case MU_MSG_FLAG_FLAGGED: return 'f';
case MU_MSG_FLAG_SIGNED: return 'Z'; case MU_MSG_FLAG_SIGNED: return 'z';
case MU_MSG_FLAG_ENCRYPTED: return 'X'; case MU_MSG_FLAG_ENCRYPTED: return 'x';
case MU_MSG_FLAG_HAS_ATTACH: return 'A'; case MU_MSG_FLAG_HAS_ATTACH: return 'a';
default: default:
g_warning ("%s: unknown flag 0x%x", __FUNCTION__, flag); g_return_val_if_reached (0);
return 0;
} }
} }

View File

@ -69,10 +69,11 @@ typedef enum _MuMsgFlags MuMsgFlags;
/** /**
* convert the char-per-flag description into a MuMsgFlags value; the characters * convert the char-per-flag description into a MuMsgFlags value; the
* D=draft,F=flagged,N=new,P=passed,R=replied,S=seen,T=trashed * characters
* a=has-attachment,s=signed, x=encrypted * D=draft,F=flagged,N=new,P=passed,R=replied,S=seen,T=trashed
* if any other characters are seen, MU_MSG_FLAG_UNKNOWN is returned. * a=has-attachment,s=signed, x=encrypted if any other characters are
* seen, MU_MSG_FLAG_UNKNOWN is returned.
* *
* @param str a string * @param str a string
* *