alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* refactor convert_to_utf8 (GMimePart *part, char *buffer)

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2010-02-02 21:50:35 +02:00
parent ee355138e9
commit a4ca5304a6
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/mu-msg-gmime.c
View File

@ -530,21 +530,36 @@ asciify (char *buf)
static gchar*
text_to_utf8 (const char* buffer, const char *charset)
{
GError *err;
gchar * utf8;
err = NULL;
utf8 = g_convert_with_fallback (buffer, -1, "UTF-8",
charset, (gchar*)".",
NULL, NULL, &err);
if (!utf8) {
MU_WRITE_LOG ("%s: conversion failed from %s: %s",
__FUNCTION__, charset, err ? err ->message : "");
if (err)
g_error_free (err);
}
return utf8;
}
/* NOTE: buffer will be *freed* or returned unchanged */ /* NOTE: buffer will be *freed* or returned unchanged */
static char* static char*
convert_to_utf8 (GMimePart *part, char *buffer) convert_to_utf8 (GMimePart *part, char *buffer)
{ {
GMimeContentType *ctype; GMimeContentType *ctype;
const char* charset; const char* charset;
GError *err = NULL;
g_return_val_if_fail (GMIME_IS_OBJECT(part), NULL);
ctype = g_mime_object_get_content_type (GMIME_OBJECT(part)); ctype = g_mime_object_get_content_type (GMIME_OBJECT(part));
if (!GMIME_IS_CONTENT_TYPE(ctype)) { g_return_val_if_fail (GMIME_IS_CONTENT_TYPE(ctype), NULL);
g_warning ("not a content type!");
return NULL;
}
charset = g_mime_content_type_get_parameter (ctype, "charset"); charset = g_mime_content_type_get_parameter (ctype, "charset");
if (charset) if (charset)
@ -552,22 +567,10 @@ convert_to_utf8 (GMimePart *part, char *buffer)
/* of course, the charset specified may be incorrect... */ /* of course, the charset specified may be incorrect... */
if (charset) { if (charset) {
char * utf8; char *utf8 = text_to_utf8 (buffer, charset);
utf8 = g_convert_with_fallback (buffer, -1, "UTF-8", if (utf8)
charset, (gchar*)".",
NULL, NULL,
&err);
if (!utf8) {
MU_WRITE_LOG ("%s: conversion failed from %s: %s",
__FUNCTION__, charset,
err ? err ->message : "");
if (err)
g_error_free (err);
} else {
g_free (buffer);
return utf8; return utf8;
} }
}
/* hmmm.... no charset at all, or conversion failed; ugly hack: /* hmmm.... no charset at all, or conversion failed; ugly hack:
* replace all non-ascii chars with '.' instead... TODO: come up * replace all non-ascii chars with '.' instead... TODO: come up