From e141908b7c24db9dc719ae68f275cd4c466664eb Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Mon, 22 Nov 2010 21:44:54 +0200
Subject: [PATCH] * cosmetics

---
 src/mu-msg-fields.c |  3 ++-
 src/mu-msg-fields.h | 12 ++++++------
 src/mu-msg.c        |  6 ++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/mu-msg-fields.c b/src/mu-msg-fields.c
index 2bb948d5..865447c6 100644
--- a/src/mu-msg-fields.c
+++ b/src/mu-msg-fields.c
@@ -33,7 +33,8 @@ enum _FieldFlags {
 	FLAG_XAPIAN_INDEX   = 1 << 1,	/* field is indexed in xapian */
 	FLAG_XAPIAN_TERM    = 1 << 2,	/* field stored as term in xapian */
 	FLAG_XAPIAN_VALUE   = 1 << 3,	/* field stored as value in xapian */
-	FLAG_XAPIAN_CONTACT = 1 << 4    /* field contains an e-mail address */
+	FLAG_XAPIAN_CONTACT = 1 << 4    /* field contains an e-mail
+					 * address */
 };
 typedef enum _FieldFlags	FieldFlags;
 
diff --git a/src/mu-msg-fields.h b/src/mu-msg-fields.h
index f0daae38..0270d255 100644
--- a/src/mu-msg-fields.h
+++ b/src/mu-msg-fields.h
@@ -41,21 +41,21 @@ enum _MuMsgFieldId {
 	MU_MSG_FIELD_ID_TO,
 	MU_MSG_FIELD_ID_MSGID,
 	MU_MSG_FIELD_ID_TIMESTAMP,
-	
-	MU_MSG_FIELD_ID_NUM
+	MU_MSG_FIELD_ID_NUM,
+
+	/* fake fields */
+	MU_MSG_PSEUDO_FIELD_ID_DATESTR,  /* used in to store datestr in db */
+	MU_MSG_FIELD_ID_NUM_WITH_PSEUDO /* number including these fake
+					 * fields */ 
 };
 typedef enum _MuMsgFieldId MuMsgFieldId;
 
 /* some specials... */
 static const MuMsgFieldId MU_MSG_FIELD_ID_NONE = (MuMsgFieldId)-1;
-static const MuMsgFieldId MU_MSG_FIELD_ID_DATESTR =
-	(MuMsgFieldId) (MU_MSG_FIELD_ID_NUM + 1);
 
 #define mu_msg_field_id_is_valid(MFID) \
 	((MFID) < MU_MSG_FIELD_ID_NUM)
 
-
-
 /* don't change the order, add new types at the end (before _NUM)*/
 enum _MuMsgFieldType {
 	MU_MSG_FIELD_TYPE_STRING,
diff --git a/src/mu-msg.c b/src/mu-msg.c
index e0d5178c..c171e90b 100644
--- a/src/mu-msg.c
+++ b/src/mu-msg.c
@@ -707,13 +707,15 @@ get_body (MuMsg *msg, gboolean want_html)
 			NULL; 
 	else
 		str = data._txt_part ?
-			part_to_string (GMIME_PART(data._txt_part), TRUE, &err) :
+			part_to_string (GMIME_PART(data._txt_part),
+					TRUE, &err) :
 			NULL;
 
 	/* note, str may be NULL (no body), but that's not necessarily
 	 * an error; we only warn when an actual error occured */
 	if (err) 
-		g_warning ("error occured while retrieving %s body for message %s",
+		g_warning ("error occured while retrieving %s body" 
+			   "for message %s",
 			   want_html ? "html" : "text",
 			   mu_msg_get_path(msg));