diff options
| author | Not Zed <NotZed@Ximian.com> | 2002-07-23 19:24:00 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2002-07-23 19:24:00 +0800 |
| commit | 122a24ce8f71aba4b3e5c12581c6e66a3ad14c73 (patch) | |
| tree | f560d975728be57b369aa4b2d2aa76aafc45142a /composer | |
| parent | b42221290cf5077a8154c6cf66fcdb3b3b1aea60 (diff) | |
| download | gsoc2013-evolution-122a24ce8f71aba4b3e5c12581c6e66a3ad14c73.tar.gz gsoc2013-evolution-122a24ce8f71aba4b3e5c12581c6e66a3ad14c73.tar.zst gsoc2013-evolution-122a24ce8f71aba4b3e5c12581c6e66a3ad14c73.zip | |
Applied patch below.
2002-07-23 Not Zed <NotZed@Ximian.com>
* Applied patch below.
2002-07-19 Christian Kreibich <christian@whoop.org>
* e.msg-composer.c (get_signature_html): Test for the signature
delimiter not only at the beginning of a signature file, but also
inside the signature.
svn path=/trunk/; revision=17547
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 10 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 13238107a2..55ef9d90e2 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,13 @@ +2002-07-23 Not Zed <NotZed@Ximian.com> + + * Applied patch below. + +2002-07-19 Christian Kreibich <christian@whoop.org> + + * e.msg-composer.c (get_signature_html): Test for the signature + delimiter not only at the beginning of a signature file, but also + inside the signature. + 2002-07-23 Jeffrey Stedfast <fejj@ximian.com> * e-msg-composer.c (e_msg_composer_set_view_bcc): Reverted some diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 41d85a91d5..5d044725c9 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -955,7 +955,7 @@ get_signature_html (EMsgComposer *composer) "%s%s%s%s" "</TD></TR></TABLE>", format_html ? "" : "<PRE>\n", - format_html || !strncmp ("-- \n", text, 4) ? "" : "-- \n", + format_html || (!strncmp ("-- \n", text, 4) || strstr(text, "\n-- \n")) ? "" : "-- \n", text, format_html ? "" : "</PRE>\n"); g_free (text); |