2013-02-23 [paul] 3.9.0cvs101

	* src/mimeview.c
		escape filename/description text, prevents error if, e.g., the
		filename contains an ampersand

diff --git a/ChangeLog b/ChangeLog
index ce4b2303ceb781c0539038f2f4343644dce39d68..ceb449d4faa8084e65a8acd82138c33dc8dea6ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-23 [paul]      3.9.0cvs101
+
+       * src/mimeview.c
+               escape filename/description text, prevents error if, e.g., the
+               filename contains an ampersand
+
 2013-02-22 [colin]     3.9.0cvs100
 
        * AUTHORS

diff --git a/PATCHSETS b/PATCHSETS
index 7ce893b7970357ccacc0b113b0512dd989309e5d..99a8ce9e5d636385f601b7a9ef2518fbebc0be5e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4598,3 +4598,4 @@
 ( cvs diff -u -r 1.115.2.268 -r 1.115.2.269 src/main.c;  ) > 3.9.0cvs98.patchset
 ( cvs diff -u -r 1.654.2.4675 -r 1.654.2.4676 configure.ac;  ) > 3.9.0cvs99.patchset
 ( cvs diff -u -r 1.100.2.89 -r 1.100.2.90 AUTHORS;  cvs diff -u -r 1.1.2.84 -r 1.1.2.85 src/gtk/authors.h;  cvs diff -u -r 1.395.2.461 -r 1.395.2.462 src/summaryview.c;  ) > 3.9.0cvs100.patchset
+( cvs diff -u -r 1.83.2.196 -r 1.83.2.197 src/mimeview.c;  ) > 3.9.0cvs101.patchset

diff --git a/configure.ac b/configure.ac
index e25da22e35a771e070f7ce174d32c02aedcfe100..befca107e8113d8c6a5ae8d5307c1e74a1aac969 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=100
+EXTRA_VERSION=101
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mimeview.c b/src/mimeview.c
index 07d98951fd58435f5613580a179b4ebd2d02b0c7..b7640a2cd3ef9ba3a082d6e7f985de6888d14973 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -2553,7 +2553,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                tiptmp = g_strconcat(tip, "\n<b>",
                                prefs_common.attach_desc && mimeinfo->description ?
                                _("Description:") : _("Filename:"),
-                               " </b>", tmp, NULL);
+                               " </b>", g_markup_escape_text(tmp,-1), NULL);
                g_free(tip);
                tip = tiptmp;
                g_free(tmp);