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

* merge branch 'master' of github.com:djcb/mu

Browse Source
This commit is contained in:
djcb
2013-06-13 23:56:35 +03:00
parent c581468ac3 b57ae66605
commit fa514435ea
20 changed files with 403 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/mu-util.c
View File

@ -438,7 +438,6 @@ mu_util_locale_is_utf8 (void)
gboolean
mu_util_fputs_encoded (const char *str, FILE *stream)
{
char *conv;
int rv;
g_return_val_if_fail (str, FALSE);
@ -449,10 +448,14 @@ mu_util_fputs_encoded (const char *str, FILE *stream)
rv = fputs (str, stream);
else { /* charset is _not_ utf8, so we actually have to
* convert it..*/
GError *err;
unsigned bytes;
err = NULL;
GError *err;
unsigned bytes;
char *conv;
err = NULL;
conv = g_locale_from_utf8 (str, -1, (gsize*)&bytes, NULL, &err);
if (!conv || err) {
/* conversion failed; this happens because is
* some cases GMime may gives us non-UTF-8
@ -462,14 +465,15 @@ mu_util_fputs_encoded (const char *str, FILE *stream)
g_warning ("%s: g_locale_from_utf8 failed: %s",
__FUNCTION__,
err ? err->message : "conversion failed");
g_clear_error (&err);
g_free (conv);
conv = g_strescape (str, NULL);
}
g_clear_error (&err);
rv = fputs (conv, stream);
g_free (conv);
}
}
return (rv == EOF) ? FALSE : TRUE;
}