aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog8
-rw-r--r--composer/e-msg-composer-attachment-bar.c2
-rw-r--r--composer/e-msg-composer.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 8a37d62f68..1f7ee0e411 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-09 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer.c (composer_get_default_charset_setting): Use
+ e_iconv_locale_charset() instead of e_iconv_locale_name(), dunno
+ what I was thinking. locale_name() doesn't even exist.
+
+ * e-msg-composer-attachment-bar.c (get_default_charset): Same.
+
2003-04-09 Chris Toshok <toshok@ximian.com>
* e-msg-composer.c (setup_ui): fix build, it's
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index 14b1244ca3..0d064a4ede 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -730,7 +730,7 @@ get_default_charset (void)
charset = e_iconv_charset_name (buf);
g_free (buf);
} else
- charset = e_iconv_locale_name ();
+ charset = e_iconv_locale_charset ();
return charset;
}
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 225970b11d..2f8ddf45e9 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -247,7 +247,7 @@ composer_get_default_charset_setting (void)
charset = e_iconv_charset_name (buf);
g_free (buf);
} else
- charset = e_iconv_locale_name ();
+ charset = e_iconv_locale_charset ();
return charset ? charset : "us-ascii";
}