r1429 - in /unstable/evolution/debian: changelog patches/02_empty-line_signature.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Nov 28 07:18:06 2009
New Revision: 1429

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1429
Log:
02_empty-line_signature.patch: stolen from upstream git. Stop 
including an empty line in front of the signature.

Added:
    unstable/evolution/debian/patches/02_empty-line_signature.patch
Modified:
    unstable/evolution/debian/changelog

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1429&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Sat Nov 28 07:18:06 2009
@@ -1,3 +1,10 @@
+evolution (2.28.1-3) UNRELEASED; urgency=low
+
+  * 02_empty-line_signature.patch: stolen from upstream git. Stop 
+    including an empty line in front of the signature.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 28 Nov 2009 08:16:53 +0100
+
 evolution (2.28.1-2) unstable; urgency=low
 
   * debian/rules:

Added: unstable/evolution/debian/patches/02_empty-line_signature.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/02_empty-line_signature.patch?rev=1429&op=file
==============================================================================
--- unstable/evolution/debian/patches/02_empty-line_signature.patch (added)
+++ unstable/evolution/debian/patches/02_empty-line_signature.patch Sat Nov 28 07:18:06 2009
@@ -1,0 +1,32 @@
+From 64892e739d1ca8b13dfa0bfb86607f2f694e5671 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Tue, 03 Nov 2009 18:49:22 +0000
+Subject: Bug #599124 - Signature always includes an empty line in front of text
+
+---
+diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
+index 9e3418a..7bf67a4 100644
+--- a/composer/e-msg-composer.c
++++ b/composer/e-msg-composer.c
+@@ -1303,7 +1303,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 : "",
+@@ -3867,8 +3867,8 @@ e_msg_composer_show_sig_file (EMsgComposer *composer)
+ 		g_free (html_text);
+ 	} else if (is_top_signature (composer)) {
+ 		/* 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);
+--
+cgit v0.8.2