Attachment 313068 Details for Bug 457353 – gdm-lang-common_name.patch

[patch] gdm-lang-common_name.patch

gdm-lang-common_name.patch (text/plain), 1.71 KB, created by Jens Petersen on 2008-07-31 03:27:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Petersen

Created: 2008-07-31 03:27:27 UTC

Size: 1.71 KB

patch

obsolete

>diff -up gdm-2.23.1/gui/simple-greeter/gdm-languages.c.orig gdm-2.23.1/gui/simple-greeter/gdm-languages.c
>--- gdm-2.23.1/gui/simple-greeter/gdm-languages.c.orig	2008-07-16 01:55:35.000000000 +1000
>+++ gdm-2.23.1/gui/simple-greeter/gdm-languages.c	2008-07-31 12:42:22.000000000 +1000
>@@ -735,6 +735,7 @@ territories_parse_start_tag (GMarkupPars
>         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 @@ territories_parse_start_tag (GMarkupPars
>         acode_2 = NULL;
>         acode_3 = NULL;
>         ncode = NULL;
>+        territory_common_name = NULL;
>         territory_name = NULL;
> 
>         while (*attr_names && *attr_values) {
>@@ -771,6 +773,11 @@ territories_parse_start_tag (GMarkupPars
>                                 }
>                                 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 @@ territories_parse_start_tag (GMarkupPars
>                 ++attr_values;
>         }
> 
>+        if (territory_common_name != NULL) {
>+                territory_name = territory_common_name;
>+        }
>+
>         if (territory_name == NULL) {
>                 return;
>         }

Actions: View | Diff

Attachments on bug 457353: 313068