[evolution/gnome-2-28] Bug #599124 - Signature always includes an empty line in front of text

[Milan Crha <mcrha src gnome org>]

commit 7e7b5a2dd59c4ea4595d99b64cb7ae4f092c8ceb
Author: Milan Crha <mcrha redhat com>
Date:   Tue Nov 3 19:50:05 2009 +0100

    Bug #599124 - Signature always includes an empty line in front of text

 composer/e-msg-composer.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 849cbe3..f18659e 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1217,7 +1217,7 @@ get_signature_html (EMsgComposer *composer)
 		 */
 		html = g_strdup_printf ("<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature\" value=\"1\">-->"
 					"<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature_name\" value=\"uid:%s\">-->"
-					"<TABLE WIDTH=\"100%%\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD><BR>"
+					"<TABLE WIDTH=\"100%%\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD>"
 					"%s%s%s%s"
 					"%s</TD></TR></TABLE>",
 					encoded_uid ? encoded_uid : "",
@@ -3832,8 +3832,8 @@ e_msg_composer_show_sig_file (EMsgComposer *composer)
 		g_free (html_text);
 	} else if (top_signature) {
 		/* insert paragraph after the signature ClueFlow things */
-		gtkhtml_editor_run_command (editor, "cursor-forward");
-		gtkhtml_editor_run_command (editor, "insert-paragraph");
+		if (gtkhtml_editor_run_command (editor, "cursor-forward"))
+			gtkhtml_editor_run_command (editor, "insert-paragraph");
 	}
 
 	gtkhtml_editor_undo_end (editor);