From abada7e2cd02933caa7a2643c0771b3ee7a63cfe Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 20 Feb 2003 21:04:19 +0000 Subject: Call camel_iconv_init(). (camel_shutdown): Call camel_iconv_shutdown(). 2003-02-20 Jeffrey Stedfast * camel.c (camel_init): Call camel_iconv_init(). (camel_shutdown): Call camel_iconv_shutdown(). * camel-sasl-digest-md5.c (digest_response): Updated to use camel-iconv and the new camel-charset-map functions. * camel-mime-utils.c: Updated to use camel-iconv and the new camel-charset-map functions. * camel-mime-part-utils.c (check_html_charset): Use camel_charset_canonical_name() instead of e_iconv_charset_name() which is longer available. (convert_buffer): Use camel-iconv. (simple_data_wrapper_construct_from_parser): Since camel_charset_iso_to_windows() returns the charset in it's canonical format, no need to re-canonicalise it. * camel-mime-part.c (process_header): Use camel_charset_canonical_name() instead of e_iconv_charset_name() which is longer available. * camel-mime-message.c (process_header): Use camel_charset_canonical_name() instead of e_iconv_charset_name() which is longer available. * camel-mime-filter-charset.c: Use camel-iconv. * camel-folder-summary.c (message_info_new): Use camel_charset_canonical_name() instead of e_iconv_charset_name() which is longer available. (content_info_new): Use camel_charset_locale_name(). (camel_message_info_new_from_header): Same as message_info_new(). * camel-search-private.c: Use g_alloca() instead of alloca(). * camel-filter-search.c (check_header): Use camel_charset_canonical_name() instead of e_iconv_charset_name() which is longer available. * camel-charset-map.c (camel_charset_locale_name): New function, replaces e_iconv_locale_charset(). (camel_charset_canonical_name): New function, similar to e_iconv_charset_name() but instead of returning the iconv-friendly name, it returns the canonical name. (g_iconv will do the iconv-friendly name conversions for us). svn path=/trunk/; revision=19977 --- camel/camel-search-private.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'camel/camel-search-private.c') diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c index 80152e7410..8b0879f7ed 100644 --- a/camel/camel-search-private.c +++ b/camel/camel-search-private.c @@ -29,6 +29,7 @@ #include #endif +#include #include #include #include @@ -225,7 +226,7 @@ camel_ustrstrcase (const char *haystack, const char *needle) if (strlen (haystack) == 0) return NULL; - puni = nuni = alloca (sizeof (gunichar) * strlen (needle)); + puni = nuni = g_alloca (sizeof (gunichar) * strlen (needle)); p = needle; while ((u = utf8_get (&p))) @@ -419,12 +420,12 @@ camel_search_header_match (const char *value, const char *match, camel_search_ma vdom = strchr(value, '@'); mdom = strchr(match, '@'); if (mdom == NULL && vdom != NULL) { - v = alloca(vdom-value+1); + v = g_alloca(vdom-value+1); memcpy(v, value, vdom-value); v[vdom-value] = 0; value = (char *)v; } else if (mdom != NULL && vdom == NULL) { - v = alloca(mdom-match+1); + v = g_alloca(mdom-match+1); memcpy(v, match, mdom-match); v[mdom-match] = 0; match = (char *)v; -- cgit v1.2.3