Re: [evolution-patches] camel utf8 warning fix

[Jeffrey Stedfast <fejj ximian com>]

sure

On Fri, 2003-05-02 at 11:29, Dan Winship wrote:
> This makes camel not say
> 
> (evolution-1.3:20409): GLib-CRITICAL **: file gutf8.c: line 1534
> (g_utf8_validate): assertion `str != NULL' failed
>  
> when summarizing connector messages.
> 
> 
> 
> ______________________________________________________________________
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
> retrieving revision 1.1807
> diff -u -r1.1807 ChangeLog
> --- ChangeLog	30 Apr 2003 15:35:28 -0000	1.1807
> +++ ChangeLog	2 May 2003 15:26:47 -0000
> @@ -1,3 +1,9 @@
> +2003-05-02  Dan Winship  <danw ximian com>
> +
> +	* camel-mime-part-utils.c
> +	(simple_data_wrapper_construct_from_parser): Don't call
> +	g_utf8_validate on an empty message. Fixes a warning.
> +
>  2003-04-29  Dan Winship  <danw ximian com>
>  
>  	* Makefile.am (camel_lock_helper_SOURCES): Remove camel-lock.c
> Index: camel-mime-part-utils.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/camel/camel-mime-part-utils.c,v
> retrieving revision 1.87
> diff -u -r1.87 camel-mime-part-utils.c
> --- camel-mime-part-utils.c	17 Apr 2003 03:09:37 -0000	1.87
> +++ camel-mime-part-utils.c	2 May 2003 15:26:47 -0000
> @@ -393,7 +393,7 @@
>  			/* we're not even going to bother trying to convert, so set the
>  			   rawtext bit to TRUE and let the mailer deal with it. */
>  			dw->rawtext = TRUE;
> -		} else if (!strcasecmp (charset, "utf-8")) {
> +		} else if (!strcasecmp (charset, "utf-8") && buffer->len) {
>  			/* check that it is valid utf8 */
>  			dw->rawtext = !g_utf8_validate (buffer->data, buffer->len, NULL);
>  		}
-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com