[gmime/gmime-2-4] Use the iconv charset equivalent of the locale charset when comparing to UTF-8

[Jeffrey Stedfast <fejj src gnome org>]

commit b91ca42e62a5033b818d97d97bebf1e82fef5d9a
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Sun Aug 5 13:56:52 2012 -0400

    Use the iconv charset equivalent of the locale charset when comparing to UTF-8

 gmime/gmime-charset.c     |    2 +-
 gmime/gmime-gpg-context.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gmime/gmime-charset.c b/gmime/gmime-charset.c
index 7920233..f38fbd6 100644
--- a/gmime/gmime-charset.c
+++ b/gmime/gmime-charset.c
@@ -285,7 +285,7 @@ g_mime_charset_map_init (void)
 	} else
 		locale_charset = NULL;
 #endif
-
+	
 	/* Apparently setlocale() is not reliable either... use getenv() instead. */
 	/*locale = setlocale (LC_ALL, NULL);*/
 	
diff --git a/gmime/gmime-gpg-context.c b/gmime/gmime-gpg-context.c
index 3c6cf86..6e5b2cb 100644
--- a/gmime/gmime-gpg-context.c
+++ b/gmime/gmime-gpg-context.c
@@ -378,7 +378,7 @@ gpg_ctx_new (GMimeSession *session, const char *path)
 	
 	stream = g_mime_stream_mem_new ();
 	gpg->diag = GMIME_STREAM_MEM (stream)->buffer;
-	charset = g_mime_locale_charset ();
+	charset = g_mime_charset_iconv_name (g_mime_locale_charset ());
 	if (g_ascii_strcasecmp (charset, "UTF-8") != 0) {
 		GMimeStream *fstream;
 		GMimeFilter *filter;