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

[halfline svn gnome org]

Author: halfline
Date: Wed Mar 26 04:28:27 2008
New Revision: 6065
URL: http://svn.gnome.org/viewvc/gdm?rev=6065&view=rev

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

	* gui/simple-greeter/gdm-languages.c
	(collect_locales_from_archive), (collect_locales):
	Don't read from archive by default for now. We're
	really interested in which locales the user has
	translations for, not all the locales glibc knows
	about.


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	Wed Mar 26 04:28:27 2008
@@ -247,12 +247,6 @@
         return normalized_name;
 }
 
-struct nameent
-{
-        char    *name;
-        uint32_t locrec_offset;
-};
-
 static gboolean
 language_name_is_valid (const char *language_name)
 {
@@ -292,6 +286,13 @@
         return is_utf8;
 }
 
+#ifdef GDM_GET_LOCALES_FROM_LIBC
+struct nameent
+{
+        char    *name;
+        uint32_t locrec_offset;
+};
+
 static gboolean
 collect_locales_from_archive (void)
 {
@@ -382,6 +383,7 @@
         g_mapped_file_free (mapped);
         return locales_collected;
 }
+#endif
 
 static int
 select_dirs (const struct dirent *dirent)
@@ -480,9 +482,11 @@
                 gdm_available_locales_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) chooser_locale_free);
         }
 
+#ifdef GDM_GET_LOCALES_FROM_LIBC
         if (collect_locales_from_archive ()) {
                 return;
         }
+#endif
 
         collect_locales_from_directory ();
 }