From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1333005agb; Thu, 31 Dec 2009 16:16:07 -0800 (PST) Received: by 10.224.115.84 with SMTP id h20mr8968448qaq.289.1262304967411; Thu, 31 Dec 2009 16:16:07 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 9si15407889qyk.95.2009.12.31.16.16.07; Thu, 31 Dec 2009 16:16:07 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 20B971858249; Thu, 31 Dec 2009 19:16:07 -0500 (EST) Received: from magnesium.club.cc.cmu.edu (MAGNESIUM.CLUB.CC.cmu.edu [128.237.157.15]) by rubyforge.org (Postfix) with ESMTP id D77781858249 for ; Thu, 31 Dec 2009 19:04:10 -0500 (EST) Received: (qmail 313 invoked from network); 31 Dec 2009 23:37:25 -0000 Received: from pion.club.cc.cmu.edu (HELO localhost.localdomain) (128.237.157.88) by magnesium.club.cc.cmu.edu with SMTP; 31 Dec 2009 23:37:25 -0000 From: Rich Lane To: sup-devel@rubyforge.org Date: Thu, 31 Dec 2009 15:36:58 -0800 Message-Id: <1262302618-20503-11-git-send-email-rlane@club.cc.cmu.edu> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1262302618-20503-10-git-send-email-rlane@club.cc.cmu.edu> References: <1262302618-20503-1-git-send-email-rlane@club.cc.cmu.edu> <1262302618-20503-2-git-send-email-rlane@club.cc.cmu.edu> <1262302618-20503-3-git-send-email-rlane@club.cc.cmu.edu> <1262302618-20503-4-git-send-email-rlane@club.cc.cmu.edu> <1262302618-20503-5-git-send-email-rlane@club.cc.cmu.edu> <1262302618-20503-6-git-send-email-rlane@club.cc.cmu.edu> <1262302618-20503-7-git-send-email-rlane@club.cc.cmu.edu> <1262302618-20503-8-git-send-email-rlane@club.cc.cmu.edu> <1262302618-20503-9-git-send-email-rlane@club.cc.cmu.edu> <1262302618-20503-10-git-send-email-rlane@club.cc.cmu.edu> Subject: [sup-devel] [PATCH 10/10] decode header fields of enclosed messages X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org --- lib/sup/message.rb | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/sup/message.rb b/lib/sup/message.rb index 519243a..ff05df6 100644 --- a/lib/sup/message.rb +++ b/lib/sup/message.rb @@ -446,15 +446,12 @@ private 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 + subj = decode_header_field(payload.header.subject) || DEFAULT_SUBJECT + subj = Message.normalize_subj(subj.gsub(/\s+/, " ").gsub(/\s+$/, "")) 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 + from_person = from ? Person.from_address(decode_header_field from) : nil + to_people = to ? Person.from_address_list(decode_header_field to) : nil + cc_people = cc ? Person.from_address_list(decode_header_field cc) : nil [Chunk::EnclosedMessage.new(from_person, to_people, cc_people, msgdate, subj)] + message_to_chunks(payload, encrypted) else debug "no body for message/rfc822 enclosure; skipping" -- 1.6.3.3 _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel