From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 28 Apr 2016 12:56:45 +0000 (+0300)
Subject: lib-charset: Revert f086fd065 - wrong version
X-Git-Tag: 2.3.0.rc1~3921
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e1ec423f53050ff373be3cdcdca5cd9bb02146a;p=thirdparty%2Fdovecot%2Fcore.git

lib-charset: Revert f086fd065 - wrong version

This wasn't the version that was supposed to be merged..
---

diff --git a/src/lib-charset/test-charset.c b/src/lib-charset/test-charset.c
index 6ba72bb93a..18da108464 100644
--- a/src/lib-charset/test-charset.c
+++ b/src/lib-charset/test-charset.c
@@ -105,12 +105,7 @@ static void test_charset_iconv(void)
 	}
 	/* Use //IGNORE just to force handling to be done by iconv
 	   instead of our own UTF-8 routines. */
-	/* check if //IGNORE is supported by ICONV */
-	if (charset_to_utf8_str("UTF-8//IGNORE", NULL, "", str, &result) < 0)
-		test_charset_utf8_common("UTF-8");
-	else
-		test_charset_utf8_common("UTF-8//IGNORE");
-	test_end();
+	test_charset_utf8_common("UTF-8//IGNORE");
 	test_end();
 }
 static void test_charset_iconv_crashes(void)