diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 9 | ||||
| -rw-r--r-- | composer/e-composer-private.c | 2 | ||||
| -rw-r--r-- | composer/e-composer-private.h | 2 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 9 |
4 files changed, 16 insertions, 6 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 66a86b07f0..6622aec517 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,12 @@ +2008-05-06 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #424744 + + * e-composer-private.c: + * e-composer-private.h: + * e-msg-composer.c: + Use camel-iconv.c instead of e-iconv.h (now deprecated). + 2008-04-28 Matthew Barnes <mbarnes@redhat.com> * e-composer-actions.c (action_send_options_cb): diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c index 55c1a824e9..a7b29e51e2 100644 --- a/composer/e-composer-private.c +++ b/composer/e-composer-private.c @@ -314,7 +314,7 @@ e_composer_get_default_charset (void) g_object_unref (client); if (charset == NULL) - charset = g_strdup (e_iconv_locale_charset ()); + charset = g_strdup (camel_iconv_locale_charset ()); if (charset == NULL) charset = g_strdup ("us-ascii"); diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h index 5381dac80d..c5ff291cc6 100644 --- a/composer/e-composer-private.h +++ b/composer/e-composer-private.h @@ -25,7 +25,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libedataserver/e-iconv.h> +#include <camel/camel-iconv.h> #include "e-attachment-bar.h" #include "e-composer-actions.h" 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); } } |