From: Andrej Kacian <ticho@claws-mail.org>
Date: Wed, 14 Feb 2018 22:03:17 +0000 (+0100)
Subject: Add support for the iso-8859-8-i encoding
X-Git-Tag: 3.17.0~206
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=0eb6698bc8d47c44c3882d0da97765f119dfac55

Add support for the iso-8859-8-i encoding

Support this encoding by aliasing it to iso-8859-8.
---

diff --git a/src/codeconv.c b/src/codeconv.c
index 0d2438bdf..4fb3f693d 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -706,12 +706,24 @@ static gint conv_noconv(gchar *outbuf, gint outlen, const gchar *inbuf)
 static const gchar *
 conv_get_fallback_for_private_encoding(const gchar *encoding)
 {
-	if (encoding && (encoding[0] == 'X' || encoding[0] == 'x') &&
-	    encoding[1] == '-') {
-		if (!g_ascii_strcasecmp(encoding, CS_X_MACCYR))
-			return CS_MACCYR;
-		if (!g_ascii_strcasecmp(encoding, CS_X_GBK))
-			return CS_GBK;
+	if (encoding) {
+		if ((encoding[0] == 'X' || encoding[0] == 'x') &&
+		    encoding[1] == '-') {
+			if (!g_ascii_strcasecmp(encoding, CS_X_MACCYR))
+				return CS_MACCYR;
+			if (!g_ascii_strcasecmp(encoding, CS_X_GBK))
+				return CS_GBK;
+		}
+		else if(!g_ascii_strcasecmp(encoding, CS_ISO_8859_8_I)) {
+			/*
+			 * ISO-8859-8-I is a variant which fully
+			 * agrees with ISO-8859-8 on character
+			 * codings, and differs only in directionality
+			 * implications, which are ignored here
+			 * anyway; and is not recognized by iconv
+			 */
+			return CS_ISO_8859_8;
+		}
 	}
 
 	return encoding;
diff --git a/src/codeconv.h b/src/codeconv.h
index f025864f7..9cf2596b8 100644
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -116,6 +116,7 @@ struct _CodeConverter
 #define CS_ISO_8859_6		"ISO-8859-6"
 #define CS_ISO_8859_7		"ISO-8859-7"
 #define CS_ISO_8859_8		"ISO-8859-8"
+#define CS_ISO_8859_8_I	"ISO-8859-8-I"
 #define CS_ISO_8859_9		"ISO-8859-9"
 #define CS_ISO_8859_10		"ISO-8859-10"
 #define CS_ISO_8859_11		"ISO-8859-11"