gdm r5865 - in trunk: . gui/simple-greeter
- From: halfline svn gnome org
- To: svn-commits-list gnome org
- Subject: gdm r5865 - in trunk: . gui/simple-greeter
- Date: Mon, 25 Feb 2008 21:50:14 +0000 (GMT)
Author: halfline
Date: Mon Feb 25 21:50:14 2008
New Revision: 5865
URL: http://svn.gnome.org/viewvc/gdm?rev=5865&view=rev
Log:
2008-02-25 Ray Strode <rstrode redhat com>
* gui/simple-greeter/gdm-languages.c:
(construct_language_name):
when constructing language name, don't
ignore codeset and modifier
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 Mon Feb 25 21:50:14 2008
@@ -205,17 +205,19 @@
{
char *name;
- /* Ignore codeset and modifier for this */
- /* FIXME: that can't be right. It's going to break
- * serbian among other things.
- */
- if (territory == NULL) {
- name = g_strdup (language);
- } else {
- name = g_strdup_printf ("%s_%s",
- language,
- territory);
- }
+ g_assert (language[0] != 0);
+ g_assert (territory == NULL || territory[0] != 0);
+ g_assert (codeset == NULL || codeset[0] != 0);
+ g_assert (modifier == NULL || modifier[0] != 0);
+
+ name = g_strdup_printf ("%s%s%s%s%s%s%s",
+ language,
+ territory != NULL? "_" : "",
+ territory != NULL? territory : "",
+ codeset != NULL? "." : "",
+ codeset != NULL? codeset : "",
+ modifier != NULL? "@" : "",
+ modifier != NULL? modifier : "");
return name;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]