From: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 8 Sep 2009 19:41:17 +0000 (-0400)
Subject: Merge branch 'enclosed-message-display-tweaks'
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=ea8c342fdef36e1876016c25dd4d7f7d4829d7c6;p=sup

Merge branch 'enclosed-message-display-tweaks'

Conflicts:
	lib/sup/message.rb
---

ea8c342fdef36e1876016c25dd4d7f7d4829d7c6
diff --cc lib/sup/message.rb
index 4a7d761,478daa9..afa8f00
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@@ -437,15 -386,20 +437,24 @@@ privat
  
        chunks
      elsif m.header.content_type == "message/rfc822"
 -      payload = RMail::Parser.read(m.body)
 -      from = payload.header.from.first ? payload.header.from.first.format : ""
 -      to = payload.header.to.map { |p| p.format }.join(", ")
 -      cc = payload.header.cc.map { |p| p.format }.join(", ")
 -      subj = payload.header.subject
 -      subj = subj ? Message.normalize_subj(payload.header.subject.gsub(/\s+/, " ").gsub(/\s+$/, "")) : subj
 -      if Rfc2047.is_encoded? subj
 -        subj = Rfc2047.decode_to $encoding, subj
 +      if m.body
 +        payload = RMail::Parser.read(m.body)
-         from = payload.header.from.first
-         from_person = from ? Person.from_address(from.format) : nil
-         [Chunk::EnclosedMessage.new(from_person, payload.to_s)] +
-           message_to_chunks(payload, encrypted)
++        from = payload.header.from.first ? payload.header.from.first.format : ""
++        to = payload.header.to.map { |p| p.format }.join(", ")
++        cc = payload.header.cc.map { |p| p.format }.join(", ")
++        subj = payload.header.subject
++        subj = subj ? Message.normalize_subj(payload.header.subject.gsub(/\s+/, " ").gsub(/\s+$/, "")) : subj
++        if Rfc2047.is_encoded? subj
++          subj = Rfc2047.decode_to $encoding, subj
++        end
++        msgdate = payload.header.date
++        from_person = from ? Person.from_address(from) : nil
++        to_people = to ? Person.from_address_list(to) : nil
++        cc_people = cc ? Person.from_address_list(cc) : nil
++        [Chunk::EnclosedMessage.new(from_person, to_people, cc_people, msgdate, subj)] + message_to_chunks(payload, encrypted)
 +      else
 +        [Chunk::EnclosedMessage.new(nil, "")]
        end
 -      msgdate = payload.header.date
 -      from_person = from ? Person.from_address(from) : nil
 -      to_people = to ? Person.from_address_list(to) : nil
 -      cc_people = cc ? Person.from_address_list(cc) : nil
 -      [Chunk::EnclosedMessage.new(from_person, to_people, cc_people, msgdate, subj)] + message_to_chunks(payload, encrypted)
      else
        filename =
          ## first, paw through the headers looking for a filename