diff options
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/mail-config.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index b04ea273ce..79504737fb 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,7 @@ +2001-06-01 Dan Winship <danw@ximian.com> + + * mail-config.c (config_read): Fix dumb misuse of g_get_charset. + 2001-05-31 Jeffrey Stedfast <fejj@ximian.com> * mail-format.c (handle_multipart_signed): Removed the code to diff --git a/mail/mail-config.c b/mail/mail-config.c index af1667200f..2819abaffa 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -40,6 +40,7 @@ #include <bonobo/bonobo-context.h> #include <gal/util/e-util.h> +#include <gal/unicode/gunicode.h> #include <e-util/e-html-utils.h> #include <e-util/e-url.h> #include "mail.h" @@ -483,7 +484,7 @@ config_read (void) config->default_charset = gnome_config_get_string (str); g_free (str); if (!config->default_charset) { - config->default_charset = g_get_charset (); + g_get_charset (&config->default_charset); if (!config->default_charset || !g_strcasecmp (config->default_charset, "US-ASCII")) config->default_charset = g_strdup ("ISO-8859-1"); |