From 58ce039ad2d8575fa5c4f5a4913864faf79e8774 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 11 Sep 2007 15:07:30 +0000
Subject: [PATCH] Monotone-Parent: ec6aa2b7257921823b50f7441ab2eb83f83f6927
 Monotone-Revision: 7c581e0875343b221a79db4c4117358d726166f1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-11T15:07:30
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                     |  6 ++++++
 UI/MailerUI/UIxMailListView.m | 19 ++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6cf4ed546..816804465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailerUI/UIxMailListView.m ([UIxMailListView -sortedUIDs]):
+	always use a "not deleted" search qualifier along with the user
+	qualifier (if present).
+
 2007-09-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index 46f7505e7..9872f8bf8 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -221,10 +221,24 @@ static int attachmentFlagSize = 8096;
 
 - (NSArray *) sortedUIDs 
 {
+  EOQualifier *fetchQualifier, *notDeleted;
   if (!sortedUIDs)
     {
+      notDeleted = [EOQualifier qualifierWithQualifierFormat:
+				  @"(not (flags = %@))",
+				@"deleted"];
+      if (qualifier)
+	{
+	  fetchQualifier = [[EOAndQualifier alloc] initWithQualifiers:
+						     notDeleted, qualifier,
+						   nil];
+	  [fetchQualifier autorelease];
+	}
+      else
+	fetchQualifier = notDeleted;
+
       sortedUIDs
-        = [[self clientObject] fetchUIDsMatchingQualifier: qualifier
+        = [[self clientObject] fetchUIDsMatchingQualifier: fetchQualifier
 			       sortOrdering: [self imap4SortOrdering]];
       [sortedUIDs retain];
     }
@@ -462,8 +476,7 @@ static int attachmentFlagSize = 8096;
 
   if ([criteria isEqualToString: @"subject"])
     qualifier = [EOQualifier qualifierWithQualifierFormat:
-			       @"(subject doesContain: %@)",
-			     value];
+			       @"(subject doesContain: %@)", value];
   else if ([criteria isEqualToString: @"sender"])
     qualifier = [EOQualifier qualifierWithQualifierFormat:
 			       @"(sender doesContain: %@)", value];