gmime r1211 - in trunk: . gmime
- From: fejj svn gnome org
- To: svn-commits-list gnome org
- Subject: gmime r1211 - in trunk: . gmime
- Date: Sat, 2 Feb 2008 17:15:39 +0000 (GMT)
Author: fejj
Date: Sat Feb 2 17:15:38 2008
New Revision: 1211
URL: http://svn.gnome.org/viewvc/gmime?rev=1211&view=rev
Log:
2008-02-02 Jeffrey Stedfast <fejj novell com>
* gmime/gmime-iconv-utils.c (iconv_utils_init): Don't break if the
user's locale is unset (e.g. US-ASCII).
Modified:
trunk/ChangeLog
trunk/gmime/gmime-iconv-utils.c
Modified: trunk/gmime/gmime-iconv-utils.c
==============================================================================
--- trunk/gmime/gmime-iconv-utils.c (original)
+++ trunk/gmime/gmime-iconv-utils.c Sat Feb 2 17:15:38 2008
@@ -55,8 +55,8 @@
#define UNLOCK()
#endif /* G_THREADS_ENABLED */
-static iconv_t utf8_to_locale;
-static iconv_t locale_to_utf8;
+static iconv_t utf8_to_locale = (iconv_t) -1;
+static iconv_t locale_to_utf8 = (iconv_t) -1;
static void
@@ -70,11 +70,15 @@
g_mime_charset_map_init ();
- utf8 = g_mime_charset_iconv_name ("utf-8");
- locale = g_mime_charset_iconv_name (g_mime_locale_charset ());
+ utf8 = g_mime_charset_iconv_name ("UTF-8");
- utf8_to_locale = iconv_open (locale, utf8);
- locale_to_utf8 = iconv_open (utf8, locale);
+ if (!(locale = g_mime_locale_charset ()))
+ locale = "US-ASCII";
+
+ if ((locale = g_mime_charset_iconv_name (locale))) {
+ utf8_to_locale = iconv_open (locale, utf8);
+ locale_to_utf8 = iconv_open (utf8, locale);
+ }
initialized = TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]