changeset 963:323dab9321bb

Fix double escaping of image overlay text. Bug 2051955, reported by Emmanuel Dupuis.
author zas_
date Sat, 16 Aug 2008 07:18:16 +0000
parents 113d8329cbd6
children ba1d3c4bc0cd
files src/image-overlay.c
diffstat 1 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/image-overlay.c	Wed Aug 13 21:07:06 2008 +0000
+++ b/src/image-overlay.c	Sat Aug 16 07:18:16 2008 +0000
@@ -414,8 +414,7 @@
 typedef enum {
 	OSDT_NONE 	= 0,
 	OSDT_FREE 	= 1 << 0,
-	OSDT_NO_ESCAPE 	= 1 << 1,
-	OSDT_NO_DUP 	= 1 << 2
+	OSDT_NO_DUP 	= 1 << 1
 } OsdTemplateFlags;
 
 static void osd_template_insert(GHashTable *vars, gchar *keyword, gchar *value, OsdTemplateFlags flags)
@@ -431,14 +430,10 @@
 		g_hash_table_insert(vars, keyword, value);
 		return;
 		}
-	else if (flags & OSDT_NO_ESCAPE)
+	else
 		{
 		g_hash_table_insert(vars, keyword, g_strdup(value));
 		}
-	else
-		{
-		g_hash_table_insert(vars, keyword, g_markup_escape_text(value, -1));
-		}
 
 	if (flags & OSDT_FREE) g_free((gpointer) value);
 }