X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=query.cc;h=c68bd37ad7fdb4bab5cc6f35cffcda8792b70919;hb=9f673f3cf866d114edc77080cd9f9e266d403c14;hp=f66ee55649767639006fade6c22a6e963848adb7;hpb=526b7144f7d692e04ce950dfa7d0ee1bdf792cdc;p=notmuch

diff --git a/query.cc b/query.cc
index f66ee556..c68bd37a 100644
--- a/query.cc
+++ b/query.cc
@@ -92,13 +92,15 @@ 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 &
-			      Xapian::QueryParser::FLAG_PHRASE &
-			      Xapian::QueryParser::FLAG_LOVEHATE &
-			      Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE &
+	unsigned int flags = (Xapian::QueryParser::FLAG_BOOLEAN |
+			      Xapian::QueryParser::FLAG_PHRASE |
+			      Xapian::QueryParser::FLAG_LOVEHATE |
+			      Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE |
 			      Xapian::QueryParser::FLAG_WILDCARD);
 
 	if (strcmp (query_string, "") == 0) {
@@ -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);