[evolution-data-server] Bug #666896 - Workaround Improper GB-2312 Mail Encodings

[Milan Crha <mcrha src gnome org>]

commit 241edbd532a37c044d184efe7bce17bfa0b58e92
Author: Palmer Dabbelt <palmem comcast net>
Date:   Wed Apr 11 18:13:12 2012 +0200

    Bug #666896 - Workaround Improper GB-2312 Mail Encodings

 camel/camel-iconv.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/camel/camel-iconv.c b/camel/camel-iconv.c
index 4b61842..ed1bff5 100644
--- a/camel/camel-iconv.c
+++ b/camel/camel-iconv.c
@@ -105,15 +105,16 @@ struct {
 	{ "euckr-0",        "EUC-KR"     },
 	{ "5601",           "EUC-KR"     },
 	{ "zh_TW-euc",      "EUC-TW"     },
-	{ "zh_CN.euc",      "gb2312"     },
+	{ "zh_CN.euc",      "gb18030"    },
 	{ "zh_TW-big5",     "BIG5"       },
-	{ "euc-cn",         "gb2312"     },
+	{ "euc-cn",         "gb18030"    },
 	{ "big5-0",         "BIG5"       },
 	{ "big5.eten-0",    "BIG5"       },
 	{ "big5hkscs-0",    "BIG5HKSCS"  },
-	{ "gb2312-0",       "gb2312"     },
-	{ "gb2312.1980-0",  "gb2312"     },
-	{ "gb-2312",        "gb2312"     },
+	{ "gb2312-0",       "gb18030"    },
+	{ "gb2312.1980-0",  "gb18030"    },
+	{ "gb-2312",        "gb18030"    },
+	{ "gb2312",         "gb18030"    },
 	{ "gb18030-0",      "gb18030"    },
 	{ "gbk-0",          "GBK"        },