From 11ec709d94cea06827785fe09d1760711939c7ef Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@novell.com>
Date: Thu, 13 May 2004 18:04:57 +0000
Subject: Don't include the last default_header when setting the default
 headers. If

2004-05-13  Jeffrey Stedfast  <fejj@novell.com>

	* em-format.c (em_format_default_headers): Don't include the last
	default_header when setting the default headers. If the user has
	configured Evolution to display the Mailer header, then it will be
	set in em-folder-view.c as appropriate when it checks the gconf
	settings. Fixes bug #58217.

	* em-mailer-prefs.c (em_mailer_prefs_construct): Default
	"x-evolution-mailer" header to disabled.

svn path=/trunk/; revision=25903
---
 mail/em-format.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mail/em-format.c')

diff --git a/mail/em-format.c b/mail/em-format.c
index 0894669a15..a93b63728c 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -762,9 +762,9 @@ void
 em_format_default_headers(EMFormat *emf)
 {
 	int i;
-
+	
 	em_format_clear_headers(emf);
-	for (i=0;i<sizeof(default_headers)/sizeof(default_headers[0]);i++)
+	for (i = 0; i < G_N_ELEMENTS (default_headers) - 1; i++)
 		em_format_add_header(emf, default_headers[i].name, default_headers[i].flags);
 }
 
-- 
cgit v1.2.3