[gmime] Assume g_mime_charset_map_init() has been called
- From: Jeffrey Stedfast <fejj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gmime] Assume g_mime_charset_map_init() has been called
- Date: Tue, 7 Feb 2017 21:05:24 +0000 (UTC)
commit ac70e41d4008cc43f78458edeef72cc83f36d550
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date: Tue Feb 7 16:05:04 2017 -0500
Assume g_mime_charset_map_init() has been called
gmime/gmime-charset.c | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/gmime/gmime-charset.c b/gmime/gmime-charset.c
index 8c2750d..9ed635a 100644
--- a/gmime/gmime-charset.c
+++ b/gmime/gmime-charset.c
@@ -270,7 +270,7 @@ g_mime_charset_map_init (void)
if (initialized++)
return;
-
+
#ifdef G_THREADS_ENABLED
g_mutex_init (&G_LOCK_NAME (lock));
#endif
@@ -361,11 +361,6 @@ g_mime_charset_map_init (void)
const char *
g_mime_locale_charset (void)
{
- CHARSET_LOCK ();
- if (!iconv_charsets)
- g_mime_charset_map_init ();
- CHARSET_UNLOCK ();
-
return locale_charset ? locale_charset : "iso-8859-1";
}
@@ -380,11 +375,6 @@ g_mime_locale_charset (void)
const char *
g_mime_locale_language (void)
{
- CHARSET_LOCK ();
- if (!iconv_charsets)
- g_mime_charset_map_init ();
- CHARSET_UNLOCK ();
-
return locale_lang;
}
@@ -452,8 +442,6 @@ g_mime_charset_iconv_name (const char *charset)
strdown (name);
CHARSET_LOCK ();
- if (!iconv_charsets)
- g_mime_charset_map_init ();
iconv_name = g_hash_table_lookup (iconv_charsets, name);
if (iconv_name) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]