aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/camel-charset-map.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 053e72158d..bc6747e81f 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-02 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-charset-map.c (camel_charset_iso_to_windows): Map us-ascii
+ to windows-1252 also.
+
2002-10-02 Not Zed <NotZed@Ximian.com>
* providers/imap/camel-imap-folder.c (get_matching): Set *set to
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index 4368e52018..8594f261cf 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -307,6 +307,7 @@ camel_charset_iso_to_windows (const char *isocharset)
/* According to http://czyborra.com/charsets/codepages.html,
* the charset mapping is as follows:
*
+ * us-ascii maps to windows-cp1252
* iso-8859-1 maps to windows-cp1252
* iso-8859-2 maps to windows-cp1250
* iso-8859-3 maps to windows-cp????
@@ -327,7 +328,7 @@ camel_charset_iso_to_windows (const char *isocharset)
* windows-cp1257.
*/
- if (!strcasecmp (isocharset, "iso-8859-1"))
+ if (!strcasecmp (isocharset, "iso-8859-1") || !strcasecmp (isocharset, "us-ascii"))
return "windows-cp1252";
else if (!strcasecmp (isocharset, "iso-8859-2"))
return "windows-cp1250";