From 239566d908447b0339c4130202056d32ba906b5e Mon Sep 17 00:00:00 2001 From: Peter Kosyh Date: Sun, 11 Nov 2018 16:03:46 +0300 Subject: [PATCH] mail: simpler query for new e-mails Before this patch, the BEOS:type was used in query. But in Haiku the BEOS:type index is not created by default. So, this feature dis not work. Change-Id: Ib57b528eb852d256b7e0b7d203659af01e077801 Reviewed-on: https://review.haiku-os.org/684 Reviewed-by: Adrien Destugues --- src/servers/mail/DeskbarView.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/servers/mail/DeskbarView.cpp b/src/servers/mail/DeskbarView.cpp index 982b2421df..a3aef86676 100644 --- a/src/servers/mail/DeskbarView.cpp +++ b/src/servers/mail/DeskbarView.cpp @@ -164,14 +164,6 @@ void DeskbarView::_RefreshMailQuery() newMailQuery->PushAttr(B_MAIL_ATTR_READ); newMailQuery->PushInt32(B_UNREAD); newMailQuery->PushOp(B_EQ); - newMailQuery->PushAttr("BEOS:TYPE"); - newMailQuery->PushString("text/x-email"); - newMailQuery->PushOp(B_EQ); - newMailQuery->PushAttr("BEOS:TYPE"); - newMailQuery->PushString("text/x-partial-email"); - newMailQuery->PushOp(B_EQ); - newMailQuery->PushOp(B_OR); - newMailQuery->PushOp(B_AND); newMailQuery->Fetch(); BEntry entry; @@ -447,8 +439,7 @@ DeskbarView::_CreateNewMailQuery(BEntry& query) if (file.InitCheck() != B_OK) return; - BString string("((" B_MAIL_ATTR_READ "<2)&&((BEOS:TYPE==" - "\"text/x-email\")||(BEOS:TYPE==\"text/x-partial-email\")))"); + BString string(B_MAIL_ATTR_READ "<2"); file.WriteAttrString("_trk/qrystr", &string); file.WriteAttrString("_trk/qryinitstr", &string); int32 mode = 'Fbyq';