X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=9b7e7b0556e7bc3810ba169a9c4e8b0fc85f3f8e;hp=2a8bbf9269f2b56d5eeff212c2ec9856116ca0b2;hb=8d77b48284c58c135a6b2787e721597346ab056d;hpb=4c1efddfd499300c7e74263e57d8aa137e84c853

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 2a8bbf9..9b7e7b0 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -519,15 +519,14 @@ show_text(CT ct, int alternate)
 	** if it is not a text part of a multipart/alternative
 	*/
 	if (!alternate || ct->c_subtype == TEXT_PLAIN) {
-		if (ct->c_charset && !check_charset(ct->c_charset,
-				strlen(ct->c_charset))) {
+		if (ct->c_charset && !is_native_charset(ct->c_charset)) {
 			snprintf(buffer, sizeof(buffer), "%%liconv -f '%s'",
 					ct->c_charset);
 		} else {
 			snprintf(buffer, sizeof(buffer), "%%lcat");
 		}
-		cp = (ct->c_showproc = getcpy(buffer));
-		return show_content_aux(ct, alternate, cp, NULL);
+		ct->c_showproc = getcpy(buffer);
+		return show_content_aux(ct, alternate, ct->c_showproc, NULL);
 	}
 
 	return NOTOK;