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

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Aug  1 16:44:04 2008
New Revision: 6346
URL: http://svn.gnome.org/viewvc/gdm?rev=6346&view=rev

Log:
Use simpler territory names 


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	Fri Aug  1 16:44:04 2008
@@ -735,6 +735,7 @@
         const char *acode_2;
         const char *acode_3;
         const char *ncode;
+        const char *territory_common_name;
         const char *territory_name;
 
         if (! g_str_equal (element_name, "iso_3166_entry") || attr_names == NULL || attr_values == NULL) {
@@ -744,6 +745,7 @@
         acode_2 = NULL;
         acode_3 = NULL;
         ncode = NULL;
+        territory_common_name = NULL;
         territory_name = NULL;
 
         while (*attr_names && *attr_values) {
@@ -771,6 +773,11 @@
                                 }
                                 ncode = *attr_values;
                         }
+                } else if (g_str_equal (*attr_names, "common_name")) {
+                        /* skip if empty */
+                        if (**attr_values) {
+                                territory_common_name = *attr_values;
+                        }
                 } else if (g_str_equal (*attr_names, "name")) {
                         territory_name = *attr_values;
                 }
@@ -779,6 +786,10 @@
                 ++attr_values;
         }
 
+        if (territory_common_name != NULL) {
+                territory_name = territory_common_name;
+        }
+
         if (territory_name == NULL) {
                 return;
         }