evolution r35061 - trunk/mail

[sragavan svn gnome org]

Author: sragavan
Date: Wed Feb 20 10:43:13 2008
New Revision: 35061
URL: http://svn.gnome.org/viewvc/evolution?rev=35061&view=rev

Log:
2008-02-20  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bug #469292

	* em-format-quote.c: (emfq_format_clone): Add empty line only when top
	posting is enabled.


Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-format-quote.c

Modified: trunk/mail/em-format-quote.c
==============================================================================
--- trunk/mail/em-format-quote.c	(original)
+++ trunk/mail/em-format-quote.c	Wed Feb 20 10:43:13 2008
@@ -36,9 +36,11 @@
 
 #include <libedataserver/e-iconv.h>
 #include <glib/gi18n.h>
+#include <gconf/gconf-client.h>
 
 #include "em-stripsig-filter.h"
 #include "em-format-quote.h"
+#include "mail-config.h"
 
 struct _EMFormatQuotePrivate {
 	int dummy;
@@ -148,8 +150,8 @@
 	((EMFormatClass *)emfq_parent)->format_clone(emf, folder, uid, msg, src);
 
 	camel_stream_reset(emfq->stream);
-
-	emfq_format_empty_line(emf, emfq->stream, (CamelMimePart *)msg, NULL);
+	if (gconf_client_get_bool(mail_config_get_gconf_client(), "/apps/evolution/mail/composer/top_signature", NULL))
+		emfq_format_empty_line(emf, emfq->stream, (CamelMimePart *)msg, NULL);
 	handle = em_format_find_handler(emf, "x-evolution/message/prefix");
 	if (handle)
 		handle->handler(emf, emfq->stream, (CamelMimePart *)msg, handle);