sup

commit f562596aa5bc0f459b55408f87976ccee1db9eb5
parent f27920ccddd3f9305913075a343ad008a50c3ede
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Sun, 24 Feb 2008 14:34:40 -0800

Merge branch 'sent-poll-fix' into next

Diffstat:

3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/lib/sup/mbox/loader.rb b/lib/sup/mbox/loader.rb
@@ -147,7 +147,7 @@ class Loader < Source
     end
 
     self.cur_offset = next_offset
-    [returned_offset, (@labels + [:unread]).uniq]
+    [returned_offset, (self.labels + [:unread]).uniq]
   end
 end
 
diff --git a/lib/sup/poll.rb b/lib/sup/poll.rb
@@ -156,7 +156,7 @@ EOS
 
           docid, entry = Index.load_entry_for_id m.id
           HookManager.run "before-add-message", :message => m
-          m = yield(m, offset, entry) or next
+          m = yield(m, offset, entry) or next if block_given?
           Index.sync_message m, docid, entry
           UpdateManager.relay self, :added, m unless entry
         rescue MessageFormatError => e
diff --git a/lib/sup/sent.rb b/lib/sup/sent.rb
@@ -22,11 +22,7 @@ class SentManager
       yield f
     end
 
-    @source.each do |offset, labels|
-      m = Message.new :source => @source, :source_info => offset, :labels => @source.labels
-      Index.sync_message m
-      UpdateManager.relay self, :added, m
-    end
+    PollManager.add_messages_from @source
   end
 end