[gcompris/gcomprixogoo] Merged from trunk 85ed78de6d1f144769bf9240e83ca6ca91197980

[Bruno Coudoin <bcoudoin src gnome org>]

commit 4c6c2ce5e87c919b8c33c068904afc3e9af2db1f
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Fri Aug 28 22:51:52 2009 +0200

    Merged from trunk 85ed78de6d1f144769bf9240e83ca6ca91197980
      Fixed a major bug resulting in garbled string in the advanced color
      activity. In this activity the color to search was garbled in American
      english and in case there is no translations available for the running
      locale.

 src/advanced_colors-activity/advanced_colors.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/advanced_colors-activity/advanced_colors.c b/src/advanced_colors-activity/advanced_colors.c
index 97f4448..3cd8629 100644
--- a/src/advanced_colors-activity/advanced_colors.c
+++ b/src/advanced_colors-activity/advanced_colors.c
@@ -480,7 +480,9 @@ static void add_xml_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child)
 	      if(text)
 		{
 		  colors[i] = gettext((char *)text);
-		  g_free(text);
+		  // We got a translation, free the original value
+		  if ( text != colors[i] )
+		    g_free(text);
 		}
 	      text = NULL;
 	      g_free(sColor);