diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2008-05-07 10:17:18 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-05-07 10:17:18 +0800 |
| commit | 2e731573fba05a9848808a359d757734ad24a607 (patch) | |
| tree | 679afb1822966010d05c0089145f195c5b948d67 /mail/em-format-html.c | |
| parent | 68552ed22e3feeb63456d03d4c428b05d17a4c0b (diff) | |
| download | gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar.gz gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar.bz2 gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar.lz gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar.xz gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar.zst gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.zip | |
** Fixes part of bug #424744
2008-05-06 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #424744
* configure.in:
Bump eds_minimum_version to 2.23.2 for camel-iconv.h.
* composer/e-composer-private.c:
* composer/e-composer-private.h:
* composer/e-msg-composer.c:
* mail/em-composer-prefs.c:
* mail/em-format-html.c:
* mail/em-format-quote.c:
* mail/em-mailer-prefs.c:
* widgets/misc/e-attachment-bar.c:
* widgets/misc/e-unicode.c:
Use camel-iconv.c instead of e-iconv.h (now deprecated).
svn path=/trunk/; revision=35474
Diffstat (limited to 'mail/em-format-html.c')
| -rw-r--r-- | mail/em-format-html.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 12fd050157..467d84c0e6 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -41,7 +41,6 @@ #undef interface #endif -#include <libedataserver/e-iconv.h> #include <libedataserver/e-data-server-util.h> /* for e_utf8_strftime, what about e_time_format_time? */ #include <libedataserver/e-time-utils.h> #include "e-util/e-icon-factory.h" @@ -54,6 +53,7 @@ #include <glib/gi18n.h> +#include <camel/camel-iconv.h> #include <camel/camel-mime-message.h> #include <camel/camel-stream.h> #include <camel/camel-stream-filter.h> @@ -1847,7 +1847,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) ct = camel_mime_part_get_content_type((CamelMimePart *)part); charset = camel_content_type_param (ct, "charset"); - charset = e_iconv_charset_name(charset); + charset = camel_iconv_charset_name(charset); if (!efh->simple_headers) camel_stream_printf(stream, |