diff options
| -rw-r--r-- | e-util/e-iconv.c | 2 | ||||
| -rw-r--r-- | widgets/misc/e-unicode.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/e-util/e-iconv.c b/e-util/e-iconv.c index bd85a7f599..d00c3620fb 100644 --- a/e-util/e-iconv.c +++ b/e-util/e-iconv.c @@ -421,7 +421,7 @@ iconv_t e_iconv_open(const char *oto, const char *ofrom) size_t e_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char ** outbuf, size_t *outbytesleft) { - return iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft); + return iconv(cd, (char **) inbuf, inbytesleft, outbuf, outbytesleft); } void diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index 871bb1e3b6..4bc5b6d0a8 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -216,7 +216,7 @@ gchar * e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) { char *new, *ob; - gchar * ib; + const char *ib; size_t ibl, obl; if (!string) return NULL; @@ -233,7 +233,7 @@ e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) return new; } - ib = (char *) string; + ib = string; ibl = bytes; new = ob = g_new (gchar, ibl * 6 + 1); obl = ibl * 6 + 1; @@ -274,7 +274,7 @@ gchar * e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) { char *new, *ob; - gchar * ib; + const char *ib; size_t ibl, obl; if (!string) return NULL; @@ -296,7 +296,7 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) return new; } - ib = (char *) string; + ib = string; ibl = bytes; new = ob = g_new (gchar, ibl * 4 + 1); obl = ibl * 4 + 1; @@ -382,7 +382,7 @@ e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes { iconv_t ic; char *new, *ob; - gchar * ib; + const char *ib; size_t ibl, obl; g_return_val_if_fail (widget != NULL, NULL); @@ -422,7 +422,7 @@ e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes } } - ib = (char *) string; + ib = string; ibl = bytes; new = ob = g_new (gchar, ibl * 6 + 1); obl = ibl * 6 + 1; @@ -466,7 +466,7 @@ e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes) { iconv_t ic; char *new, *ob; - gchar * ib; + const char *ib; size_t ibl, obl; if (!string) return NULL; @@ -500,7 +500,7 @@ e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes) return new; } - ib = (char *) string; + ib = string; ibl = bytes; new = ob = g_new (gchar, ibl * 4 + 1); obl = ibl * 4 + 1; |