Merged trunk changes r9797:9829 into 217update branch.
--- gdm-2.6.0.3/gui/gdmlanguages.c 2004-03-01 08:24:57.000000000 -0800
+++ gdm-2.6.0.3-patch/gui/gdmlanguages.c 2004-11-10 11:31:05.674392432 -0800
@@ -547,13 +547,6 @@
if ( ! got_english)
langs = g_list_prepend (langs, g_strdup ("en_US"));
- curlocale = setlocale (LC_MESSAGES, NULL);
- if (curlocale != NULL &&
- strcmp (curlocale, "C") != 0 &&
- find_lang (curlocale, &clean) == NULL) {
- langs = g_list_prepend (langs, g_strdup (curlocale));
- }
-
langs = g_list_sort (langs, lang_collate);
VE_IGNORE_EINTR (fclose (langlist));