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

[halfline svn gnome org]

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

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

	* gui/simple-greeter/gdm-languages.c:
	(collect_locales_from_{archives,directory}):
	don't discard modifier and codeset


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:54:14 2008
@@ -424,9 +424,11 @@
                 gdm_parse_language_name (names[cnt].name,
                                          &locale->language_code,
                                          &locale->territory_code,
-                                         NULL, NULL);
+                                         &locale->codeset,
+                                         &locale->modifier);
 
-                locale->name = construct_language_name (locale->language_code, locale->territory_code, NULL, NULL);
+                locale->name = construct_language_name (locale->language_code, locale->territory_code,
+                                                        locale->codeset, locale->modifier);
 
                 if (g_hash_table_lookup (gdm_available_locales_map, locale->name) != NULL) {
                         chooser_locale_free (locale);
@@ -504,10 +506,11 @@
                 gdm_parse_language_name (dirents[cnt]->d_name,
                                          &locale->language_code,
                                          &locale->territory_code,
-                                         NULL, NULL);
+                                         &locale->codeset,
+                                         &locale->modifier);
 
-                /* Ignore codeset and modifier for this */
-                locale->name = construct_language_name (locale->language_code, locale->territory_code, NULL, NULL);
+                locale->name = construct_language_name (locale->language_code, locale->territory_code,
+                                                        locale->codeset, locale->modifier);
 
                 if (g_hash_table_lookup (gdm_available_locales_map, locale->name) != NULL) {
                         chooser_locale_free (locale);