alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* cosmetics, minor

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-08-10 23:58:06 +03:00
parent 48cf82f823
commit ba93c7bef7
5 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/mu-msg-flags.c
View File

@ -26,39 +26,38 @@
#include "mu-msg-flags.h" #include "mu-msg-flags.h"
/* put these in alpha-order, so output strings are ordered thusly /* put these in alpha-order, so output strings are ordered correctly
* note, these should be in lower-case, otherwise Xapian gets * (that's the way the Maildir spec teaches us)
* confused...
*/ */
static const MuMsgFlags ALL_FLAGS[] = { static const MuMsgFlags ALL_FLAGS[] = {
/* a */ MU_MSG_FLAG_HAS_ATTACH, /* a */ MU_MSG_FLAG_HAS_ATTACH, /* non-maildir flag */
/* d */ MU_MSG_FLAG_DRAFT, /* D */ MU_MSG_FLAG_DRAFT,
/* f */ MU_MSG_FLAG_FLAGGED, /* F */ MU_MSG_FLAG_FLAGGED,
/* n */ MU_MSG_FLAG_NEW, /* N */ MU_MSG_FLAG_NEW,
/* p */ MU_MSG_FLAG_PASSED, /* P */ MU_MSG_FLAG_PASSED,
/* r */ MU_MSG_FLAG_REPLIED, /* R */ MU_MSG_FLAG_REPLIED,
/* s */ MU_MSG_FLAG_SEEN, /* S */ MU_MSG_FLAG_SEEN,
/* t */ MU_MSG_FLAG_TRASHED, /* T */ MU_MSG_FLAG_TRASHED,
/* u */ MU_MSG_FLAG_UNREAD, /* U */ MU_MSG_FLAG_UNREAD, /* pseudo flag */
/* x */ MU_MSG_FLAG_ENCRYPTED, /* x */ MU_MSG_FLAG_ENCRYPTED, /* non-maildir flag */
/* z */ MU_MSG_FLAG_SIGNED /* z */ MU_MSG_FLAG_SIGNED /* non-maildir flag */
}; };
MuMsgFlags MuMsgFlags
mu_msg_flag_from_char (char k) mu_msg_flag_from_char (char k)
{ {
switch (g_ascii_tolower(k)) { switch (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;
/* NEW OR NOT SEEN */ /* NEW OR NOT SEEN */
case 'u': return MU_MSG_FLAG_UNREAD; case 'U': return MU_MSG_FLAG_UNREAD;
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;
@ -75,7 +74,6 @@ mu_msg_flag_from_file_char (char k)
switch (k) { switch (k) {
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 '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;
@ -114,18 +112,20 @@ mu_msg_flag_name (MuMsgFlags flag)
char char
mu_msg_flag_char (MuMsgFlags flag) mu_msg_flag_char (MuMsgFlags flag)
{ {
g_return_val_if_fail (flag != MU_MSG_FLAG_NONE, 0);
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';
/* NEW OR NOT SEEN */ /* NEW OR NOT SEEN */
case MU_MSG_FLAG_UNREAD: return 'u'; case MU_MSG_FLAG_UNREAD: return 'U';
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';
@ -162,7 +162,7 @@ mu_msg_flags_from_str (const char* str)
for (flags = MU_MSG_FLAG_NONE; str && *str; ++str) { for (flags = MU_MSG_FLAG_NONE; str && *str; ++str) {
MuMsgFlags flag; MuMsgFlags flag;
if ((flag = mu_msg_flag_char (*str)) == 0) { if ((flag = mu_msg_flag_from_char (*str)) == 0) {
flags = 0; flags = 0;
break; break;
} }
@ -184,3 +184,5 @@ mu_msg_flags_foreach (MuMsgFlagsForeachFunc func, gpointer user_data)
func (ALL_FLAGS[i], user_data); func (ALL_FLAGS[i], user_data);
} }

13
src/mu-msg-flags.h
View File

@ -71,21 +71,22 @@ enum _MuMsgFlags {
/* "x"->encrypted message */ /* "x"->encrypted message */
MU_MSG_FLAG_ENCRYPTED = 1 << 9, MU_MSG_FLAG_ENCRYPTED = 1 << 9,
/* "a"->message has attachment */ /* "a"->message has attachment */
MU_MSG_FLAG_HAS_ATTACH = 1 << 10 MU_MSG_FLAG_HAS_ATTACH = 1 << 10,
}; };
typedef enum _MuMsgFlags MuMsgFlags; typedef enum _MuMsgFlags MuMsgFlags;
#define MU_MSG_FLAG_INVALID (-1)
/** /**
* convert the char-per-flag description into a MuMsgFlags value; the * convert the char-per-flag description into a MuMsgFlags value; the
* characters * characters D=draft, F=flagged, N=new, P=passed, R=replied, S=seen,
* D=draft,F=flagged,N=new,P=passed,R=replied,S=seen,T=trashed * T=trashed a=has-attachment, s=signed, x=encrypted are accepted; if
* a=has-attachment,s=signed, x=encrypted if any other characters are * any other characters are seen, MU_MSG_FLAG_INVALID is returned.
* seen, MU_MSG_FLAG_NONE is returned.
* *
* @param str a string * @param str a string
* *
* @return a MuMSgFlags value, or MU_MSG_FLAG_UNKNOWN in case of error * @return a MuMSgFlags value, or MU_MSG_FLAG_INVALID in case of error
*/ */
MuMsgFlags mu_msg_flags_from_str (const char* str) G_GNUC_PURE; MuMsgFlags mu_msg_flags_from_str (const char* str) G_GNUC_PURE;

3
src/mu-store.cc
View File

@ -179,7 +179,8 @@ check_version (MuStore *store)
} }
MuStore* MuStore*
mu_store_new (const char* xpath, const char *contacts_cache, mu_store_new (const char* xpath,
const char *contacts_cache,
GError **err) GError **err)
{ {
g_return_val_if_fail (xpath, NULL); g_return_val_if_fail (xpath, NULL);

1
src/mu-store.h
View File

@ -44,7 +44,6 @@ typedef struct _MuStore MuStore;
MuStore* mu_store_new (const char *xpath, const char *ccachepath, MuStore* mu_store_new (const char *xpath, const char *ccachepath,
GError **err) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; GError **err) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
/** /**
* destroy the MuStore object and free resources * destroy the MuStore object and free resources
* *