[geary/wip/721828-undo-2: 18/18] Ensure destination UIDs are stored in move operation

[Jim Nelson <jnelson src gnome org>]

commit 0222b37cd90b40c238f75ede577766dc69ee142c
Author: Jim Nelson <jim yorba org>
Date:   Mon Jan 26 17:44:23 2015 -0800

    Ensure destination UIDs are stored in move operation

 .../replay-ops/imap-engine-move-email.vala         |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-move-email.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-move-email.vala
index 3778f59..e4b19db 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-move-email.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-move-email.vala
@@ -80,7 +80,12 @@ private class Geary.ImapEngine.MoveEmail : Geary.ImapEngine.SendReplayOperation
                 throw new IOError.CANCELLED("Move email to %s cancelled", engine.remote_folder.to_string());
             
             Imap.MessageSet msg_set = iter.get();
-            yield engine.remote_folder.copy_email_async(msg_set, destination, null);
+            
+            Gee.Map<Imap.UID, Imap.UID>? src_dst_uids = yield engine.remote_folder.copy_email_async(
+                msg_set, destination, null);
+            if (src_dst_uids != null)
+                destination_uids.add_all(src_dst_uids.values);
+            
             yield engine.remote_folder.remove_email_async(msg_set.to_list(), null);
             
             // completed successfully, remove from list in case of retry