aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2001-02-05 22:39:55 +0800
committerChris Lahey <clahey@src.gnome.org>2001-02-05 22:39:55 +0800
commit6c2bb13f676683a4ea59af45bf9d750bb6a84591 (patch)
tree74e6e3a50e2b1b13530549eaffcb975393bd4d2e
parent5017e3175fabbd56b3ee9434b8a32ea3948cfe57 (diff)
downloadgsoc2013-evolution-6c2bb13f676683a4ea59af45bf9d750bb6a84591.tar
gsoc2013-evolution-6c2bb13f676683a4ea59af45bf9d750bb6a84591.tar.gz
gsoc2013-evolution-6c2bb13f676683a4ea59af45bf9d750bb6a84591.tar.bz2
gsoc2013-evolution-6c2bb13f676683a4ea59af45bf9d750bb6a84591.tar.lz
gsoc2013-evolution-6c2bb13f676683a4ea59af45bf9d750bb6a84591.tar.xz
gsoc2013-evolution-6c2bb13f676683a4ea59af45bf9d750bb6a84591.tar.zst
gsoc2013-evolution-6c2bb13f676683a4ea59af45bf9d750bb6a84591.zip
Changed the call to iconv to be char ** instead of const char **.
2001-02-05 Christopher James Lahey <clahey@helixcode.com> * gal/widgets/e-font.c (e_font_to_native), gal/widgets/e-unicode.c (e_utf8_from_gtk_string_sized, e_utf8_to_gtk_string_sized): Changed the call to iconv to be char ** instead of const char **. svn path=/trunk/; revision=7970
-rw-r--r--widgets/misc/e-unicode.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
index 4ea7c2ce58..8de74fa842 100644
--- a/widgets/misc/e-unicode.c
+++ b/widgets/misc/e-unicode.c
@@ -204,7 +204,7 @@ e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes
{
iconv_t ic;
char *new, *ob;
- const gchar * ib;
+ gchar * ib;
size_t ibl, obl;
g_return_val_if_fail (widget != NULL, NULL);
@@ -234,7 +234,7 @@ e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes
} else {
gint i;
/* iso-8859-1 */
- ib = string;
+ ib = (char *) string;
new = ob = g_new (unsigned char, bytes * 2 + 1);
for (i = 0; i < (bytes); i ++) {
ob += g_unichar_to_utf8 (ib[i], ob);
@@ -244,7 +244,7 @@ e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes
}
}
- ib = string;
+ ib = (char *) string;
ibl = bytes;
new = ob = g_new (gchar, ibl * 6 + 1);
obl = ibl * 6 + 1;
@@ -285,7 +285,7 @@ e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes)
{
iconv_t ic;
char *new, *ob;
- const gchar * ib;
+ gchar * ib;
size_t ibl, obl;
if (!string) return NULL;
@@ -318,7 +318,7 @@ e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes)
return new;
}
- ib = string;
+ ib = (char *) string;
ibl = bytes;
new = ob = g_new (gchar, ibl * 4 + 1);
obl = ibl * 4 + 1;