[geary/geary-0.6: 7/14] Skip non-outbox msgs in conversation when deleting: Closes bgo#727268

[Jim Nelson <jnelson src gnome org>]

commit 674f5cb8599fade80553a3bff74ad0efeee8068f
Author: Jim Nelson <jim yorba org>
Date:   Fri Mar 28 17:43:07 2014 -0700

    Skip non-outbox msgs in conversation when deleting: Closes bgo#727268
    
    Don't throw an exception if one EmailIdentifier is unrecognized,
    simply skip it and delete the ones that are recognized.

 src/engine/imap-db/outbox/smtp-outbox-folder.vala |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/engine/imap-db/outbox/smtp-outbox-folder.vala 
b/src/engine/imap-db/outbox/smtp-outbox-folder.vala
index 9499aff..22c82f4 100644
--- a/src/engine/imap-db/outbox/smtp-outbox-folder.vala
+++ b/src/engine/imap-db/outbox/smtp-outbox-folder.vala
@@ -547,9 +547,11 @@ private class Geary.SmtpOutboxFolder : Geary.AbstractLocalFolder, Geary.FolderSu
         int final_count = 0;
         yield db.exec_transaction_async(Db.TransactionType.WR, (cx) => {
             foreach (Geary.EmailIdentifier id in email_ids) {
+                // ignore anything not belonging to the outbox, but also don't report it as removed
+                // either
                 SmtpOutboxEmailIdentifier? outbox_id = id as SmtpOutboxEmailIdentifier;
                 if (outbox_id == null)
-                    throw new EngineError.BAD_PARAMETERS("%s is not outbox EmailIdentifier", id.to_string());
+                    continue;
                 
                 // Even though we discard the new value here, this check must
                 // occur before any insert/delete on the table, to ensure we