aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/ChangeLog8
-rw-r--r--widgets/misc/e-attachment-bar.c4
-rw-r--r--widgets/misc/e-unicode.c22
3 files changed, 21 insertions, 13 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 4b91f93784..ce075694a7 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-06 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #424744
+
+ * e-attachment-bar.c:
+ * e-unicode.c:
+ Use camel-iconv.c instead of e-iconv.h (now deprecated).
+
2008-04-30 Milan Crha <mcrha@redhat.com>
** Part of fix for bug #528288
diff --git a/widgets/misc/e-attachment-bar.c b/widgets/misc/e-attachment-bar.c
index 81eae05193..3acfd0d23e 100644
--- a/widgets/misc/e-attachment-bar.c
+++ b/widgets/misc/e-attachment-bar.c
@@ -39,10 +39,10 @@
#include "e-attachment.h"
#include "e-attachment-bar.h"
-#include <libedataserver/e-iconv.h>
#include <libedataserver/e-data-server-util.h>
#include <camel/camel-data-wrapper.h>
+#include <camel/camel-iconv.h>
#include <camel/camel-mime-message.h>
#include <camel/camel-stream-fs.h>
#include <camel/camel-stream-null.h>
@@ -1086,7 +1086,7 @@ get_default_charset (void)
g_object_unref (gconf);
- if (!charset && (locale = e_iconv_locale_charset ()))
+ if (!charset && (locale = camel_iconv_locale_charset ()))
charset = g_strdup (locale);
return charset ? charset : g_strdup ("us-ascii");
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
index 5aec40a125..1731c0934e 100644
--- a/widgets/misc/e-unicode.c
+++ b/widgets/misc/e-unicode.c
@@ -40,7 +40,7 @@
#include <gtk/gtk.h>
#include <libxml/xmlmemory.h>
-#include <libedataserver/e-iconv.h>
+#include <camel/camel-iconv.h>
#include <glib/gi18n.h>
#include "e-unicode.h"
@@ -260,7 +260,7 @@ e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes)
obl = ibl * 6;
while (ibl > 0) {
- e_iconv (ic, &ib, &ibl, &ob, &obl);
+ camel_iconv (ic, &ib, &ibl, &ob, &obl);
if (ibl > 0) {
gint len;
if ((*ib & 0x80) == 0x00) len = 1;
@@ -323,7 +323,7 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes)
obl = ibl * 4;
while (ibl > 0) {
- e_iconv (ic, &ib, &ibl, &ob, &obl);
+ camel_iconv (ic, &ib, &ibl, &ob, &obl);
if (ibl > 0) {
gint len;
if ((*ib & 0x80) == 0x00) len = 1;
@@ -365,9 +365,9 @@ e_utf8_from_charset_string_sized (const gchar *charset, const gchar *string, gin
if (!string) return NULL;
- ic = e_iconv_open("utf-8", charset);
+ ic = camel_iconv_open("utf-8", charset);
ret = e_utf8_from_iconv_string_sized (ic, string, bytes);
- e_iconv_close(ic);
+ camel_iconv_close(ic);
return ret;
}
@@ -387,9 +387,9 @@ e_utf8_to_charset_string_sized (const gchar *charset, const gchar *string, gint
if (!string) return NULL;
- ic = e_iconv_open(charset, "utf-8");
+ ic = camel_iconv_open(charset, "utf-8");
ret = e_utf8_to_iconv_string_sized (ic, string, bytes);
- e_iconv_close(ic);
+ camel_iconv_close(ic);
return ret;
}
@@ -409,9 +409,9 @@ e_utf8_from_locale_string_sized (const gchar *string, gint bytes)
if (!string) return NULL;
- ic = e_iconv_open("utf-8", e_iconv_locale_charset());
+ ic = camel_iconv_open("utf-8", camel_iconv_locale_charset());
ret = e_utf8_from_iconv_string_sized (ic, string, bytes);
- e_iconv_close(ic);
+ camel_iconv_close(ic);
return ret;
}
@@ -431,9 +431,9 @@ e_utf8_to_locale_string_sized (const gchar *string, gint bytes)
if (!string) return NULL;
- ic = e_iconv_open(e_iconv_locale_charset(), "utf-8");
+ ic = camel_iconv_open(camel_iconv_locale_charset(), "utf-8");
ret = e_utf8_to_iconv_string_sized (ic, string, bytes);
- e_iconv_close(ic);
+ camel_iconv_close(ic);
return ret;
}