[gcompris/gcomprixogoo] Removed flags from GCompris. Flags create political issue. There is not always a clear relationship



commit 60fdfec820c0856bbabf20e62a85e91906b6f2cc
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun Apr 25 11:41:58 2010 +0200

    Removed flags from GCompris. Flags create political issue. There is not
    always a clear relationship between a country flag and a language.

 boards/flags/README     |    1 -
 boards/flags/af.svgz    |  Bin 1045 -> 0 bytes
 boards/flags/am.svgz    |  Bin 1300 -> 0 bytes
 boards/flags/ar.svgz    |  Bin 15020 -> 0 bytes
 boards/flags/ast.svgz   |  Bin 3030 -> 0 bytes
 boards/flags/az.svgz    |  Bin 1077 -> 0 bytes
 boards/flags/be.svgz    |  Bin 841 -> 0 bytes
 boards/flags/bg.svgz    |  Bin 832 -> 0 bytes
 boards/flags/br.svgz    |  Bin 2959 -> 0 bytes
 boards/flags/ca.svgz    |  Bin 937 -> 0 bytes
 boards/flags/ch.svgz    |  Bin 883 -> 0 bytes
 boards/flags/cs.svgz    |  Bin 934 -> 0 bytes
 boards/flags/da.svgz    |  Bin 874 -> 0 bytes
 boards/flags/de.svgz    |  Bin 848 -> 0 bytes
 boards/flags/dz.svgz    |  Bin 21813 -> 0 bytes
 boards/flags/el.svgz    |  Bin 949 -> 0 bytes
 boards/flags/en.svgz    |  Bin 1762 -> 0 bytes
 boards/flags/en_CA.svgz |  Bin 1451 -> 0 bytes
 boards/flags/en_GB.svgz |  Bin 1203 -> 0 bytes
 boards/flags/es.svgz    |  Bin 41730 -> 0 bytes
 boards/flags/eu.svgz    |  Bin 1042 -> 0 bytes
 boards/flags/fa.svgz    |  Bin 1499 -> 0 bytes
 boards/flags/fi.svgz    |  Bin 839 -> 0 bytes
 boards/flags/fr.svgz    |  Bin 797 -> 0 bytes
 boards/flags/ga.svgz    |  Bin 799 -> 0 bytes
 boards/flags/gu.svgz    |  Bin 3728 -> 0 bytes
 boards/flags/he.svgz    |  Bin 1528 -> 0 bytes
 boards/flags/hi.svgz    |  Bin 3725 -> 0 bytes
 boards/flags/hr.svgz    |  Bin 12605 -> 0 bytes
 boards/flags/hu.svgz    |  Bin 763 -> 0 bytes
 boards/flags/id.svgz    |  Bin 747 -> 0 bytes
 boards/flags/it.svgz    |  Bin 798 -> 0 bytes
 boards/flags/ja.svgz    |  Bin 823 -> 0 bytes
 boards/flags/ka.svgz    |  Bin 1211 -> 0 bytes
 boards/flags/ko.svgz    |  Bin 1161 -> 0 bytes
 boards/flags/lt.svgz    |  Bin 818 -> 0 bytes
 boards/flags/mk.svgz    |  Bin 1191 -> 0 bytes
 boards/flags/ml.svgz    |  Bin 3727 -> 0 bytes
 boards/flags/mr.svgz    |  Bin 3722 -> 0 bytes
 boards/flags/ms.svgz    |  Bin 1358 -> 0 bytes
 boards/flags/nb.svgz    |  Bin 824 -> 0 bytes
 boards/flags/ne.svgz    |  Bin 1810 -> 0 bytes
 boards/flags/nl.svgz    |  Bin 847 -> 0 bytes
 boards/flags/nn.svgz    |  Bin 831 -> 0 bytes
 boards/flags/oc.svgz    |  Bin 2831 -> 0 bytes
 boards/flags/pa.svgz    |  Bin 3725 -> 0 bytes
 boards/flags/pl.svgz    |  Bin 763 -> 0 bytes
 boards/flags/pt.svgz    |  Bin 32765 -> 0 bytes
 boards/flags/pt_BR.svgz |  Bin 2963 -> 0 bytes
 boards/flags/ro.svgz    |  Bin 760 -> 0 bytes
 boards/flags/ru.svgz    |  Bin 811 -> 0 bytes
 boards/flags/rw.svgz    |  Bin 1190 -> 0 bytes
 boards/flags/sk.svgz    |  Bin 2146 -> 0 bytes
 boards/flags/sl.svgz    |  Bin 3010 -> 0 bytes
 boards/flags/so.svgz    |  Bin 829 -> 0 bytes
 boards/flags/sq.svgz    |  Bin 5203 -> 0 bytes
 boards/flags/sr.svgz    |  Bin 165971 -> 0 bytes
 boards/flags/sv.svgz    |  Bin 772 -> 0 bytes
 boards/flags/ta.svgz    |  Bin 3728 -> 0 bytes
 boards/flags/th.svgz    |  Bin 869 -> 0 bytes
 boards/flags/tr.svgz    |  Bin 1262 -> 0 bytes
 boards/flags/uk.svgz    |  Bin 758 -> 0 bytes
 boards/flags/ur.svgz    |  Bin 1210 -> 0 bytes
 boards/flags/vi.svgz    |  Bin 1038 -> 0 bytes
 boards/flags/wa.svgz    |  Bin 8450 -> 0 bytes
 boards/flags/zh.svgz    |  Bin 1246 -> 0 bytes
 boards/flags/zh_TW.svgz |  Bin 1039 -> 0 bytes
 src/gcompris/config.c   |   53 -----------------------------------------------
 68 files changed, 0 insertions(+), 54 deletions(-)
---
diff --git a/src/gcompris/config.c b/src/gcompris/config.c
index 9cbde2c..d004e0f 100644
--- a/src/gcompris/config.c
+++ b/src/gcompris/config.c
@@ -29,7 +29,6 @@
 
 static GooCanvasItem	*rootitem		= NULL;
 static GooCanvasItem	*item_locale_text	= NULL;
-static GooCanvasItem	*item_locale_flag	= NULL;
 static GooCanvasItem	*item_bad_flag		= NULL;
 static GooCanvasItem	*item_timer_text	= NULL;
 static GooCanvasItem	*item_skin_text		= NULL;
@@ -207,9 +206,6 @@ gc_config_start ()
 
   display_previous_next(x_start, y_start, "locale_previous", "locale_next");
 
-  item_locale_flag = goo_canvas_svg_new (rootitem,
-					 rsvg_handle_new(),
-					 NULL);
   y_flag_start = y_start - pixmap_width/2;
 
   /* Display a bad icon if this locale is not available */
@@ -540,7 +536,6 @@ display_previous_next(guint x_start, guint y_start,
 static void
 set_locale_flag(gchar *locale)
 {
-  gchar *filename;
 
   if(locale == NULL)
     return;
@@ -551,53 +546,6 @@ set_locale_flag(gchar *locale)
     g_message("gc_locale_get_user_default = %s\n", locale);
   }
 
-  /* First try to find a flag for the long locale name */
-  filename = gc_file_find_absolute("flags/%.5s.svgz", locale);
-
-  /* Not found, Try now with the short locale name */
-  if(!filename) {
-    filename = gc_file_find_absolute("flags/%.2s.svgz", locale);
-  }
-
-  /* Not found, Try now with the short long locale name */
-  if(!filename) {
-    filename = gc_file_find_absolute("flags/%.3s.svgz", locale);
-  }
-
-  if(filename)
-    {
-      RsvgHandle *svg_handle;
-      RsvgDimensionData dimension;
-
-      svg_handle = gc_rsvg_load(filename);
-      rsvg_handle_get_dimensions(svg_handle, &dimension);
-
-      /* Calc the ratio to display it */
-      double xratio =  210.0  / dimension.width;
-      double yratio =  160.0  / dimension.height;
-      xratio = MIN(xratio, yratio);
-      goo_canvas_item_set_transform(item_locale_flag, NULL);
-      goo_canvas_item_scale(item_locale_flag,
-			    xratio, xratio);
-      goo_canvas_item_translate(item_locale_flag,
-				(x_flag_start + 260) / xratio,
-				(y_flag_start + 40) / xratio);
-
-      g_object_set (item_locale_flag,
-		    "svg-handle", svg_handle,
-		    NULL);
-
-      g_object_unref(svg_handle);
-      g_free(filename);
-    }
-  else
-    {
-      /* No flags */
-      g_object_set (item_locale_flag,
-		    "svg-handle", rsvg_handle_new(),
-		    NULL);
-    }
-
   /* Check wether or not the locale is available */
 #ifdef WIN32
   /* On win32, it's always available, do not try to check */
@@ -626,7 +574,6 @@ static gchar *
 get_next_locale(gchar *locale)
 {
   guint i = 0;
-
   while(linguas[i] != NULL)
     {
       if(!strcmp(locale, linguas[i]))



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]