charsets: don't warn if we couldn't convert from hex to utf8

2012-02-07 17:48:23 +01:00
parent 0c6e5e713e
commit 9f6f80a63a
1 changed files with 2 additions and 1 deletions
--- a/src/mm-charsets.c
+++ b/src/mm-charsets.c
@@ -160,7 +160,8 @@ mm_modem_charset_hex_to_utf8 (const char *src, MMModemCharset charset)
    g_return_val_if_fail (iconv_from != NULL, FALSE);

    unconverted = utils_hexstr2bin (src, &unconverted_len);
-    g_return_val_if_fail (unconverted != NULL, NULL);
+    if (!unconverted)
+        return NULL;

    if (charset == MM_MODEM_CHARSET_UTF8 || charset == MM_MODEM_CHARSET_IRA)
        return unconverted;