Re: [evolution-patches] mail, nul in reply quote



looks good (what's with the re-formatting? :)

Jeff

On Fri, 2004-08-13 at 13:45 +0800, Not Zed wrote:
> 
> spotted this while trying to find out why my replies have trailing pre
> blocks, something radek noticed earlier.  it's including the trailing
> nul in the length output.
> 
> unfortunately it doesn't fix that issue at all; as far as i can tell,
> evo-mail is not adding any pre to the text where it shouldn't be and
> where it isn't properly closed, its coming from the gtkhtml editor
> afaict.  
> 
> -- 
> 
> Michael Zucchi <notzed ximian com>
> "born to die, live to work, it's
> all downhill from here"
> Novell's Evolution and Free
> Software Developer
> Plain text document attachment (e-quote.diff)
> Index: mail/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
> retrieving revision 1.3431
> diff -u -3 -r1.3431 ChangeLog
> --- mail/ChangeLog	12 Aug 2004 06:53:45 -0000	1.3431
> +++ mail/ChangeLog	13 Aug 2004 05:22:23 -0000
> @@ -1,3 +1,9 @@
> +2004-08-13  Not Zed  <NotZed Ximian com>
> +
> +	* em-utils.c (em_utils_message_to_html): don't include the
> +	terminating NUL in the data length.
> +	(em_utils_part_to_html): nor here.
> +
>  2004-08-10  Not Zed  <NotZed Ximian com>
>  
>  	* mail-session.c (get_password): just call
> Index: mail/em-utils.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/em-utils.c,v
> retrieving revision 1.47
> diff -u -3 -r1.47 em-utils.c
> --- mail/em-utils.c	28 Jul 2004 14:38:50 -0000	1.47
> +++ mail/em-utils.c	13 Aug 2004 05:22:24 -0000
> @@ -1385,17 +1385,17 @@
>  		if (source->charset)
>  			em_format_set_default_charset((EMFormat *)emfq, source->charset);
>  	}
> -	em_format_part((EMFormat *) emfq, (CamelStream *) mem, part);
> -	g_object_unref (emfq);
> -	
> -	camel_stream_write ((CamelStream *) mem, "", 1);
> -	camel_object_unref (mem);
> -	
> +	em_format_part((EMFormat *) emfq, (CamelStream *)mem, part);
> +	g_object_unref(emfq);
> +
> +	camel_stream_write((CamelStream *) mem, "", 1);
> +	camel_object_unref(mem);
> +
>  	text = buf->data;
>  	if (len)
> -		*len = buf->len;
> +		*len = buf->len-1;
>  	g_byte_array_free (buf, FALSE);
> -	
> +
>  	return text;
>  }
>  
> @@ -1418,24 +1418,24 @@
>  	CamelStreamMem *mem;
>  	GByteArray *buf;
>  	char *text;
> -	
> +
>  	buf = g_byte_array_new ();
>  	mem = (CamelStreamMem *) camel_stream_mem_new ();
>  	camel_stream_mem_set_byte_array (mem, buf);
> -	
> +
>  	emfq = em_format_quote_new(credits, (CamelStream *)mem, flags);
>  	em_format_set_session((EMFormat *)emfq, session);
>  	em_format_format_clone((EMFormat *)emfq, NULL, NULL, message, source);
>  	g_object_unref (emfq);
> -	
> -	camel_stream_write ((CamelStream *) mem, "", 1);
> -	camel_object_unref (mem);
> -	
> +
> +	camel_stream_write((CamelStream *)mem, "", 1);
> +	camel_object_unref(mem);
> +
>  	text = buf->data;
>  	if (len)
> -		*len = buf->len;
> -	g_byte_array_free (buf, FALSE);
> -	
> +		*len = buf->len-1;
> +	g_byte_array_free(buf, FALSE);
> +
>  	return text;
>  }
>  
-- 
Jeffrey Stedfast
Evolution Hacker - Novell, Inc.
fejj ximian com  - www.novell.com

Attachment: smime.p7s
Description: S/MIME cryptographic signature



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]