From: Paul Mangan <paul@claws-mail.org>
Date: Tue, 9 Aug 2011 11:11:10 +0000 (+0000)
Subject: 2011-08-09 [paul]	3.7.9cvs43
X-Git-Tag: rel_3_7_10~11
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=980b322a50d24f1c08d6e0bd38a41ffbfe434fbb

2011-08-09 [paul]	3.7.9cvs43

	* src/mimeview.c
		fix bug 2420, 'Invalid markup in icon tooltip text after signature check'
---

diff --git a/ChangeLog b/ChangeLog
index 7ce71d98e..904640ba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-09 [paul]	3.7.9cvs43
+
+	* src/mimeview.c
+		fix bug 2420, 'Invalid markup in icon tooltip text after signature check'
+
 2011-08-06 [paul]	3.7.9cvs42
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index acae70d85..9686e69db 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4194,3 +4194,4 @@
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 claws-mail.desktop;  ) > 3.7.9cvs40.patchset
 ( cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/gtk/description_window.c;  ) > 3.7.9cvs41.patchset
 ( cvs diff -u -r 1.382.2.577 -r 1.382.2.578 src/compose.c;  ) > 3.7.9cvs42.patchset
+( cvs diff -u -r 1.83.2.168 -r 1.83.2.169 src/mimeview.c;  ) > 3.7.9cvs43.patchset
diff --git a/configure.ac b/configure.ac
index 881d1cda2..d584910fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=42
+EXTRA_VERSION=43
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mimeview.c b/src/mimeview.c
index 1533bd6e8..21ef99687 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -2404,7 +2404,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
 		g_free(tmp);
 	}
 	if (sigshort && *sigshort) {
-		tiptmp = g_strjoin("\n", tip, sigshort, NULL);
+		tiptmp = g_markup_escape_text(sigshort, -1);
 		g_free(tip);
 		tip = tiptmp;
 	}