aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/e-msg-composer-attachment-bar.c5
-rw-r--r--composer/e-msg-composer.c5
3 files changed, 12 insertions, 5 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 836a4ec441..3afe287371 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-25 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer.c: Same as below.
+
+ * e-msg-composer-attachment-bar.c: Go back to using
+ e_iconv_charset_name().
+
2003-02-24 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (drag_data_received): Make sure the url is !=
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index 2b2921fd50..13d3fef946 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -44,7 +44,8 @@
#include "e-icon-list.h"
-#include "camel/camel-charset-map.h"
+#include <gal/util/e-iconv.h>
+
#include "camel/camel-data-wrapper.h"
#include "camel/camel-stream-fs.h"
#include "camel/camel-stream-null.h"
@@ -729,7 +730,7 @@ get_default_charset (void)
gconf = gconf_client_get_default ();
buf = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
- charset = camel_charset_canonical_name (buf);
+ charset = e_iconv_charset_name (buf);
g_free (buf);
return charset;
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 8cea22d775..25c54b86ce 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -52,8 +52,6 @@
#include <errno.h>
#include <ctype.h>
-#include <glib/gunicode.h>
-
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtkscrolledwindow.h>
@@ -76,6 +74,7 @@
#include <glade/glade.h>
+#include <gal/util/e-iconv.h>
#include <gal/widgets/e-gui-utils.h>
#include <gal/e-text/e-entry.h>
@@ -240,7 +239,7 @@ composer_get_default_charset_setting (void)
gconf = gconf_client_get_default ();
buf = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
- charset = camel_charset_canonical_name (buf);
+ charset = e_iconv_charset_name (buf);
g_free (buf);
return charset;