Revision: 1058
http://geeqie.svn.sourceforge.net/geeqie/?rev=1058&view=rev
Author: zas_
Date: 2008-08-16 07:18:16 +0000 (Sat, 16 Aug 2008)
Log Message:
-----------
Fix double escaping of image overlay text.
Bug 2051955, reported by Emmanuel Dupuis.
Modified Paths:
--------------
trunk/src/image-overlay.c
Modified: trunk/src/image-overlay.c
===================================================================
--- trunk/src/image-overlay.c 2008-08-13 21:07:06 UTC (rev 1057)
+++ trunk/src/image-overlay.c 2008-08-16 07:18:16 UTC (rev 1058)
@@ -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);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
