aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/openpgp-utils.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ccde26d72c..670641500f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-24 Jeffrey Stedfast <fejj@ximian.com>
+
+ * openpgp-utils.c (openpgp_verify): Default to iso-8859-1 as the
+ user's charset here if it is undefined. This is a better choice
+ than us-ascii.
+
2001-03-23 Jon Trowbridge <trow@ximian.com>
* mail-display.c (handle_embedded_address_object): #ifdef away
diff --git a/mail/openpgp-utils.c b/mail/openpgp-utils.c
index d5ab123e09..ff74596f6c 100644
--- a/mail/openpgp-utils.c
+++ b/mail/openpgp-utils.c
@@ -1167,7 +1167,7 @@ openpgp_verify (const gchar *in, gint inlen, const gchar *sigin, gint siglen, Ca
charset = getenv ("CHARSET");
if (!charset)
- charset = "US-ASCII";
+ charset = "ISO-8859-1";
cd = iconv_open ("UTF-8", charset);