aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorJohnny Jacob <jjohnny@src.gnome.org>2007-08-10 18:08:45 +0800
committerJohnny Jacob <jjohnny@src.gnome.org>2007-08-10 18:08:45 +0800
commit12612097ba3d19e3c471152d8226caaa87d74989 (patch)
treeb9a5d40f196b2c4c0ed11db7869f76599b933702 /composer
parent3dc3ecca61c07f2c5083865e540bbd5d66bdf58d (diff)
downloadgsoc2013-evolution-12612097ba3d19e3c471152d8226caaa87d74989.tar.gz
gsoc2013-evolution-12612097ba3d19e3c471152d8226caaa87d74989.tar.zst
gsoc2013-evolution-12612097ba3d19e3c471152d8226caaa87d74989.zip
Fix for Bug 462138 – Signature on top doesn't work... Committed on behalf of P
Sankar <psankar@novell.com> svn path=/trunk/; revision=33977
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog9
-rw-r--r--composer/e-msg-composer.c6
2 files changed, 15 insertions, 0 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index d763f94437..284f2302a7 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-10 Johnny Jacob <jjohnny@novell.com>
+
+ * Modified and committed on behalf of Sankar P <psankar@novell.com>
+
+ ** Fixes #462138
+
+ * e-msg-composer.c: (set_editor_text): Signature on top does not work if
+ no signature is set as default.
+
2007-08-02 Hiroyuki Ikezoe <poincare@ikezoe.net>
** Fix for bug #462332
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 315273715f..0d569dcd9a 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1304,6 +1304,12 @@ set_editor_text(EMsgComposer *composer, const char *text, ssize_t len, int set_s
/* HTML Signature. Make it as part of body */
body = g_strdup_printf ("</br>%s</br>%s", tmp, text);
}
+ g_free (tmp);
+ } else {
+ /* No signature set */
+ body = g_strdup_printf ("<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature\" value=\"1\">-->"
+ "<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature_name\" value=\"uid:Noname\">-->"
+ "<TABLE WIDTH=\"100%%\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD> </TD></TR></TABLE>%s", text);
}
} else {
body = g_strdup(text);