aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@novell.com>2008-02-20 18:43:13 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2008-02-20 18:43:13 +0800
commit88b3d916826ce7895f1c1e142dba039093a88f29 (patch)
treed2d40bd4950f4b8f9692301cafa5efccc7bba183
parenta5e3103c863488660d248872d582b004fc45e846 (diff)
downloadgsoc2013-evolution-88b3d916826ce7895f1c1e142dba039093a88f29.tar.gz
gsoc2013-evolution-88b3d916826ce7895f1c1e142dba039093a88f29.tar.zst
gsoc2013-evolution-88b3d916826ce7895f1c1e142dba039093a88f29.zip
** Fix for bug #469292
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. svn path=/trunk/; revision=35061
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-format-quote.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d3da82cd77..4a5495043a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
2008-02-19 Milan Crha <mcrha@redhat.com>
** Fix for bug #516349
diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index f14a2dc091..b70a904153 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -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 @@ emfq_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMime
((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);