glib r7182 - in trunk: . tests

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Jul 14 19:31:33 2008
New Revision: 7182
URL: http://svn.gnome.org/viewvc/glib?rev=7182&view=rev

Log:
        * tests/iochannel-test.c: Ignore the error if iconv doesn't
        support EUC-JP.



Modified:
   trunk/ChangeLog
   trunk/tests/iochannel-test.c

Modified: trunk/tests/iochannel-test.c
==============================================================================
--- trunk/tests/iochannel-test.c	(original)
+++ trunk/tests/iochannel-test.c	Mon Jul 14 19:31:33 2008
@@ -91,8 +91,11 @@
     if (gerr)
       {
         g_warning (gerr->message);
+        /* Keep going if this is just a case of iconv not supporting EUC-JP, see bug 428048 */
+        if (gerr->code != G_CONVERT_ERROR_NO_CONVERSION)
+          return 1;
         g_error_free (gerr);
-        return 1;
+        gerr = NULL;
       }
     
     g_io_channel_set_buffer_size (gio_r, BUFFER_SIZE);