From f2e8927f6f0711b2faa6b752f4411cc7358e767b Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Tue, 11 Jan 2011 23:18:55 +0200
Subject: [PATCH] * mu-msg-fields: store escaped versions of maildirs, so
 matching works for 'strangely named' ones

---
 src/mu-msg-fields.c | 2 +-
 src/mu-store.cc     | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/mu-msg-fields.c b/src/mu-msg-fields.c
index 3cfdc2fe..c176952d 100644
--- a/src/mu-msg-fields.c
+++ b/src/mu-msg-fields.c
@@ -113,7 +113,7 @@ static const MuMsgField FIELD_DATA[] = {
 		MU_MSG_FIELD_TYPE_STRING,
 		"maildir", 'm', 'M',
 		FLAG_GMIME | FLAG_XAPIAN_TERM | FLAG_XAPIAN_VALUE |
-		FLAG_NORMALIZE
+		FLAG_NORMALIZE | FLAG_XAPIAN_ESCAPE
 	},
 	
 	{ 
diff --git a/src/mu-store.cc b/src/mu-store.cc
index 2dfbb599..6e470383 100644
--- a/src/mu-store.cc
+++ b/src/mu-store.cc
@@ -251,8 +251,6 @@ rollback_trx_if (MuStore *store, gboolean cond)
 	}
 }
 
-
-
 void
 mu_store_flush (MuStore *store)
 {
@@ -335,7 +333,7 @@ add_terms_values_string (Xapian::Document& doc, MuMsg *msg,
 		mu_str_normalize_in_place (val, TRUE);
 	if (mu_msg_field_xapian_escape (mfid))
 		mu_str_ascii_xapian_escape_in_place (val);
-	
+
 	if (mu_msg_field_xapian_index (mfid)) {
 		Xapian::TermGenerator termgen;
 		termgen.set_document (doc);
@@ -402,8 +400,7 @@ add_terms_values (MuMsgFieldId mfid, MsgDoc* msgdoc)
 		if (mu_msg_field_is_numeric (mfid)) 
 			add_terms_values_number (*msgdoc->_doc, msgdoc->_msg,
 						 mfid);
-		else if (mu_msg_field_type (mfid) ==
-			 MU_MSG_FIELD_TYPE_STRING)
+		else if (mu_msg_field_type (mfid) == MU_MSG_FIELD_TYPE_STRING)
 			add_terms_values_string (*msgdoc->_doc,
 						 msgdoc->_msg,
 						 mfid);