summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2008-07-10 15:59:30 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-07-10 15:59:30 +0000
commit733098b0d49f622cd721173249ac34b6904dc93c (patch)
tree6eb176f090e158fc546d21e891e8e431e87dd986
parent7c7696a4827e7780f4fbcf9cb93cd25d25d65cbe (diff)
downloadgdm-733098b0d49f622cd721173249ac34b6904dc93c.tar.gz
Same here
svn path=/branches/gnome-2-22/; revision=6294
-rw-r--r--ChangeLog2
-rw-r--r--gui/simple-greeter/gdm-language-option-widget.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c82d918f..be71e72a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2008-07-10 Matthias Clasen <mclasen@redhat.com>
+ * gui/simple-greeter/gdm-language-option-widget.c
+ (gdm_language_option_widget_lookup_item):
* gui/simple-greeter/gdm-language-chooser-widget.c
(gdm_language_chooser_widget_add_language): Add lang tags, to
help Pango pick the right font. Proposed by Jens Petersen.
diff --git a/gui/simple-greeter/gdm-language-option-widget.c b/gui/simple-greeter/gdm-language-option-widget.c
index 1770f6e7..893a58e6 100644
--- a/gui/simple-greeter/gdm-language-option-widget.c
+++ b/gui/simple-greeter/gdm-language-option-widget.c
@@ -146,6 +146,7 @@ gdm_language_option_widget_lookup_item (GdmRecentOptionWidget *widget,
{
char *language;
char *readable_language;
+ char *lang_tag;
language = gdm_get_language_from_name (locale, locale);
@@ -154,10 +155,13 @@ gdm_language_option_widget_lookup_item (GdmRecentOptionWidget *widget,
}
readable_language = gdm_get_language_from_name (locale, NULL);
-
- *name = language;
+ gdm_parse_language_name (locale, &lang_tag, NULL, NULL, NULL);
+ *name = g_strdup_printf ("<span lang=\"%s\">%s</span>", lang_tag, language);
*comment = readable_language;
+ g_free (language);
+ g_free (lang_tag);
+
return TRUE;
}