sup

commit 1474193564b8968e041cf260dfdc9ad909742fc6
parent 344ae55b4fe626431d800230843bddf5a93eb429
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Thu,  3 Sep 2009 11:23:05 -0400

Merge branch 'master' into next

Diffstat:

1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/bin/sup-sync b/bin/sup-sync
@@ -174,7 +174,12 @@ begin
       ## decide what to do based on message labels and the operation we're performing
       dothis, new_labels = case
       when (op == :restore) && restored_state[m.id] && old_m && (old_m.labels != restored_state[m.id])
+        num_restored += 1
         [:update_message_state, restored_state[m.id]]
+      when (op == :restore) && restored_state[m.id] && !old_m
+        num_restored += 1
+        m.labels = restored_state[m.id]
+        :add_message
       when op == :discard
         if old_m && (old_m.labels != m.labels)
           [:update_message_state, m.labels]