gdm r5866 - in trunk: . gui/simple-greeter
- From: halfline svn gnome org
- To: svn-commits-list gnome org
- Subject: gdm r5866 - in trunk: . gui/simple-greeter
- Date: Mon, 25 Feb 2008 21:51:35 +0000 (GMT)
Author: halfline
Date: Mon Feb 25 21:51:35 2008
New Revision: 5866
URL: http://svn.gnome.org/viewvc/gdm?rev=5866&view=rev
Log:
2008-02-25 Ray Strode <rstrode redhat com>
* gui/simple-greeter/gdm-languages.c:
(gdm_normalize_language_name):
when normalizing language names, don't
discard 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:51:35 2008
@@ -228,16 +228,25 @@
char *normalized_name;
char *language_code;
char *territory_code;
+ char *codeset;
+ char *modifier;
+
+ if (name[0] == '\0') {
+ return NULL;
+ }
gdm_parse_language_name (name,
&language_code,
&territory_code,
- NULL, NULL);
+ &codeset, &modifier);
normalized_name = construct_language_name (language_code,
- territory_code, NULL, NULL);
+ territory_code,
+ codeset, modifier);
g_free (language_code);
g_free (territory_code);
+ g_free (codeset);
+ g_free (modifier);
return normalized_name;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]