gdm r5867 - in trunk: . gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Mon Feb 25 21:52:44 2008
New Revision: 5867
URL: http://svn.gnome.org/viewvc/gdm?rev=5867&view=rev

Log:
2008-02-25  Ray Strode  <rstrode redhat com>

	* gui/simple-greeter/gdm-languages.c:
	(collect_locales_from_directory),
	(collect_locales_from_archives):
	filter out invalid and non-utf8 locales
	from language list


Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-languages.c

Modified: trunk/gui/simple-greeter/gdm-languages.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-languages.c	(original)
+++ trunk/gui/simple-greeter/gdm-languages.c	Mon Feb 25 21:52:44 2008
@@ -412,7 +412,12 @@
 
         for (cnt = 0; cnt < used; ++cnt) {
                 struct locrecent *locrec;
-                GdmLocale *locale;
+                GdmLocale        *locale;
+
+                if (!language_name_is_valid (names[cnt].name) ||
+                    !language_name_is_utf8 (names[cnt].name)) {
+                        continue;
+                }
 
                 locale = g_new0 (GdmLocale, 1);
 
@@ -486,9 +491,14 @@
         ndirents = scandir (LIBLOCALEDIR, &dirents, select_dirs, alphasort);
 
         for (cnt = 0; cnt < ndirents; ++cnt) {
-                char             *path;
+                char      *path;
                 GdmLocale *locale;
-                gboolean          res;
+                gboolean   res;
+
+                if (!language_name_is_valid (dirents[cnt]->d_name) ||
+                    !language_name_is_utf8 (dirents[cnt]->d_name)) {
+                        continue;
+                }
 
                 locale = g_new0 (GdmLocale, 1);
                 gdm_parse_language_name (dirents[cnt]->d_name,