X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=query.cc;h=c68bd37ad7fdb4bab5cc6f35cffcda8792b70919;hp=5750167580c0f94ecf0eae11a18aef7ce399300d;hb=9ec68aa9c4694bdf1b948bb93299e0270ec071ae;hpb=15d949b7404b322df39e2aae7a5653e4cf8a8dc9

diff --git a/query.cc b/query.cc
index 57501675..c68bd37a 100644
--- a/query.cc
+++ b/query.cc
@@ -92,7 +92,9 @@ notmuch_query_search (notmuch_query_t *query)
 
     try {
 	Xapian::Enquire enquire (*notmuch->xapian_db);
-	Xapian::Query mail_query ("Kmail");
+	Xapian::Query mail_query (talloc_asprintf (query, "%s%s",
+						   _find_prefix ("type"),
+						   "mail"));
 	Xapian::Query string_query, final_query;
 	Xapian::MSet mset;
 	unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN |
@@ -112,10 +114,10 @@ notmuch_query_search (notmuch_query_t *query)
 
 	switch (query->sort) {
 	case NOTMUCH_SORT_DATE_OLDEST_FIRST:
-	    enquire.set_sort_by_value (NOTMUCH_VALUE_DATE, FALSE);
+	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE);
 	    break;
 	case NOTMUCH_SORT_DATE_NEWEST_FIRST:
-	    enquire.set_sort_by_value (NOTMUCH_VALUE_DATE, TRUE);
+	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, TRUE);
 	    break;
 	case NOTMUCH_SORT_MESSAGE_ID:
 	    enquire.set_sort_by_value (NOTMUCH_VALUE_MESSAGE_ID, FALSE);