sup

commit dc15c15bb8c7336be299606c423f6de111877064
parent 45dc40dc11d986b846df7cda0f72deb2d511eaa4
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Mon,  4 May 2009 05:41:43 -0700

Merge branch 'master' into next

Diffstat:

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/sup/poll.rb b/lib/sup/poll.rb
@@ -101,9 +101,9 @@ EOS
           yield "Found message at #{offset} with labels {#{m.labels * ', '}}"
           unless entry
             num += 1
-            from_and_subj << [m.from.longname, m.subj]
+            from_and_subj << [m.from && m.from.longname, m.subj]
             if m.has_label?(:inbox) && ([:spam, :deleted, :killed] & m.labels).empty?
-              from_and_subj_inbox << [m.from.longname, m.subj]
+              from_and_subj_inbox << [m.from && m.from.longname, m.subj]
               numi += 1 
             end
           end