[Xfce4-commits] <postler:master> Always fallback to the default message charset

[Christian Dywan]

Updating branch refs/heads/master
         to 0a161d84b7176a31cad7a64fc9812ebb35883ca6 (commit)
       from 29b5ea263ed4edce7d61f9320fd675c700a58232 (commit)

commit 0a161d84b7176a31cad7a64fc9812ebb35883ca6
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Jun 25 23:24:54 2011 +0200

    Always fallback to the default message charset

 postler/postler-message.vala |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/postler/postler-message.vala b/postler/postler-message.vala
index 83a3324..1d26cb3 100644
--- a/postler/postler-message.vala
+++ b/postler/postler-message.vala
@@ -475,7 +475,7 @@ namespace Postler {
                         string[] parts = line.split (":", 2);
                         string field = ascii_strdown (parts[0] ?? "");
                         if (field == "content-type") {
-                            string ctype = charset;
+                            string ctype = get_charset ();
                             string mtype = "text/plain";
                             fname = null;
                             parse_content_type (parts[1].strip (), ref ctype,
@@ -490,7 +490,7 @@ namespace Postler {
                         }
                         else if (field == "content-disposition" ) {
                             string content_disposition = parts[1].strip ();
-                            string cset = charset;
+                            string cset = get_charset ();
                             string mtype = "text/plain";
                             fname = null;
                             parse_content_type (content_disposition, ref cset,
@@ -518,7 +518,7 @@ namespace Postler {
                       && mime_type_is_text (message_part.mime_type))
                     line = line != "" ? (string)GLib.Base64.decode (line) : "";
                 try {
-                    string cset = message_part.charset ?? charset;
+                    string cset = message_part.charset ?? get_charset ();
                     if (cset != "UTF-8")
                         line = GLib.convert (line, -1, "UTF-8", cset, null);
                 }