Merge branch 'sent-poll-fix' into next

[sup] / lib / sup / mbox / loader.rb

diff --git a/lib/sup/mbox/loader.rb b/lib/sup/mbox/loader.rb
index 605a2c63fee18871640778ce3690bb1140b3d3ac..4acc0645d90f99dd7ac5f77768a1b3e26c30e4a5 100644 (file)
--- a/lib/sup/mbox/loader.rb
+++ b/lib/sup/mbox/loader.rb
@@ -37,7 +37,7 @@ class Loader < Source
     if File.dirname(path) =~ /\b(var|usr|spool)\b/
       []
     else
-      [File.basename(path).intern]
+      [File.basename(path).downcase.intern]
     end
   end
 
@@ -69,7 +69,7 @@ class Loader < Source
       begin
         RMail::Mailbox::MBoxReader.new(@f).each_message do |input|
           m = RMail::Parser.read(input)
-          if m.body
+          if m.body && m.body.is_a?(String)
             m.body.gsub!(/^>From /, "From ")
           end
           return m
@@ -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