[geary] Don't blacklist curr folder when expanding conversation: Bug #714563

[Jim Nelson <jnelson src gnome org>]

commit 76007930bc21c7450735e2e46ecd0703461ade8e
Author: Jim Nelson <jim yorba org>
Date:   Tue Jan 27 12:08:06 2015 -0800

    Don't blacklist curr folder when expanding conversation: Bug #714563
    
    The App.ConversationMonitor would blacklist the current folder when
    searching for email related to a conversation.  Earlier searching for
    related emails returned SearchEmailIdentifiers and there was a
    question about determining equivalence with ImapDB.EmailIdentifiers.
    However, that's no longer the case (Message-ID searching returnes
    ImapDB.EmailIdentifiers), so searching within the current folder is
    not a problem.
    
    This means that constructing conversations where very old messages are
    in the current folder -- for example, All Mail -- will be loaded
    without expanding the window to load all email in the span.

 src/engine/app/app-conversation-monitor.vala |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/engine/app/app-conversation-monitor.vala b/src/engine/app/app-conversation-monitor.vala
index ecad09f..db4373a 100644
--- a/src/engine/app/app-conversation-monitor.vala
+++ b/src/engine/app/app-conversation-monitor.vala
@@ -499,8 +499,7 @@ public class Geary.App.ConversationMonitor : BaseObject {
             Geary.SpecialFolderType.DRAFTS,
         };
         
-        Gee.ArrayList<Geary.FolderPath?> blacklist
-            = new Gee.ArrayList<Geary.FolderPath?>();
+        Gee.ArrayList<Geary.FolderPath?> blacklist = new Gee.ArrayList<Geary.FolderPath?>();
         foreach (Geary.SpecialFolderType type in blacklisted_folder_types) {
             try {
                 Geary.Folder? blacklist_folder = folder.account.get_special_folder(type);
@@ -512,10 +511,7 @@ public class Geary.App.ConversationMonitor : BaseObject {
             }
         }
         
-        // Add the current folder so we omit search results we can find through
-        // folder monitoring.  Add "no folders" so we omit results that have
-        // been deleted permanently from the server.
-        blacklist.add(folder.path);
+        // Add "no folders" so we omit results that have been deleted permanently from the server.
         blacklist.add(null);
         
         return blacklist;