sup

commit d200de299e8a42d202481088a202af8e72913e4a
parent b0587850a0cd616fe5340706abae83576952c22d
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Tue,  2 Jun 2009 09:43:21 -0700

Merge branch 'master' into next

Diffstat:

2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/lib/sup/message-chunks.rb b/lib/sup/message-chunks.rb
@@ -99,7 +99,7 @@ EOS
       text =
         case @content_type
         when /^text\/plain\b/
-          Iconv.easy_decode $encoding, encoded_content.charset, @raw_content
+          Iconv.easy_decode $encoding, encoded_content.charset || $encoding, @raw_content
         else
           HookManager.run "mime-decode", :content_type => content_type,
                           :filename => lambda { write_to_disk },
diff --git a/lib/sup/util.rb b/lib/sup/util.rb
@@ -642,7 +642,4 @@ class Iconv
       text
     end
   end
-
-  ## normalize a string to be in the current encoding ($encoding)
-  def self.normalize s; easy_decode $encoding, $encoding, s end
 end