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 /composer/e-msg-composer.c | |
| parent | 68552ed22e3feeb63456d03d4c428b05d17a4c0b (diff) | |
| download | gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar.gz 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 'composer/e-msg-composer.c')
| -rw-r--r-- | composer/e-msg-composer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 276db10ce8..2aaffba0d4 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -76,6 +76,7 @@ #include <camel/camel-session.h> #include <camel/camel-charset-map.h> +#include <camel/camel-iconv.h> #include <camel/camel-stream-filter.h> #include <camel/camel-mime-filter-charset.h> #include <camel/camel-stream-mem.h> @@ -255,7 +256,7 @@ best_encoding (GByteArray *buf, const gchar *charset) if (!charset) return -1; - cd = e_iconv_open (charset, "utf-8"); + cd = camel_iconv_open (charset, "utf-8"); if (cd == (iconv_t) -1) return -1; @@ -264,13 +265,13 @@ best_encoding (GByteArray *buf, const gchar *charset) do { out = outbuf; outlen = sizeof (outbuf); - status = e_iconv (cd, (const gchar **) &in, &inlen, &out, &outlen); + status = camel_iconv (cd, (const gchar **) &in, &inlen, &out, &outlen); for (ch = out - 1; ch >= outbuf; ch--) { if ((guchar) *ch > 127) count++; } } while (status == (gsize) -1 && errno == E2BIG); - e_iconv_close (cd); + camel_iconv_close (cd); if (status == (gsize) -1 || status > 0) return -1; @@ -619,7 +620,7 @@ build_message (EMsgComposer *composer, type = camel_content_type_new ("text", "plain"); if ((charset = best_charset (data, p->charset, &plain_encoding))) { camel_content_type_set_param (type, "charset", charset); - iconv_charset = e_iconv_charset_name (charset); + iconv_charset = camel_iconv_charset_name (charset); g_free (charset); } } |