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

[halfline svn gnome org]

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

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

	* gui/simple-greeter/gdm-languages.c
	(gdm_get_language_from_name),
	(gdm_get_all_language_names):
	only create/populate the hash tables that are needed
	from either function instead of all hash tables from
	both functions


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:34:42 2008
@@ -63,8 +63,6 @@
 static GHashTable *gdm_territories_map;
 static GHashTable *gdm_available_locales_map;
 
-static gboolean gdm_languages_is_initialized = FALSE;
-
 static void
 gdm_locale_free (GdmLocale *locale)
 {
@@ -833,12 +831,12 @@
         const char *language;
         const char *territory;
 
-        if (!gdm_languages_is_initialized) {
-                collect_locales ();
+        if (gdm_languages_map == NULL) {
                 languages_init ();
-                territories_init ();
+        }
 
-                gdm_languages_is_initialized = TRUE;
+        if (gdm_territories_map == NULL) {
+                territories_init ();
         }
 
         language_code = NULL;
@@ -882,12 +880,8 @@
         gpointer key, value;
         GPtrArray *array;
 
-        if (!gdm_languages_is_initialized) {
+        if (gdm_available_locales_map == NULL) {
                 collect_locales ();
-                languages_init ();
-                territories_init ();
-
-                gdm_languages_is_initialized = TRUE;
         }
 
         array = g_ptr_array_new ();