|
Line
Link Here
|
| 0 |
-- a/liblightdm-gobject/language.c.orig |
0 |
++ b/liblightdm-gobject/language.c |
|
Lines 210-215
Link Here
|
| 210 |
|
210 |
|
| 211 |
if (!priv->name) |
211 |
if (!priv->name) |
| 212 |
{ |
212 |
{ |
|
|
213 |
#if HAVE_LC_IDENTIFICATION |
| 213 |
g_autofree gchar *locale = get_locale_name (priv->code); |
214 |
g_autofree gchar *locale = get_locale_name (priv->code); |
| 214 |
if (locale) |
215 |
if (locale) |
| 215 |
{ |
216 |
{ |
|
Lines 224-229
Link Here
|
| 224 |
setlocale (LC_ALL, current); |
225 |
setlocale (LC_ALL, current); |
| 225 |
} |
226 |
} |
| 226 |
if (!priv->name) |
227 |
if (!priv->name) |
|
|
228 |
#endif |
| 227 |
{ |
229 |
{ |
| 228 |
g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 2); |
230 |
g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 2); |
| 229 |
priv->name = g_strdup (tokens[0]); |
231 |
priv->name = g_strdup (tokens[0]); |
|
Lines 250-255
Link Here
|
| 250 |
|
252 |
|
| 251 |
if (!priv->territory && strchr (priv->code, '_')) |
253 |
if (!priv->territory && strchr (priv->code, '_')) |
| 252 |
{ |
254 |
{ |
|
|
255 |
#if HAVE_LC_IDENTIFICATION |
| 253 |
g_autofree gchar *locale = get_locale_name (priv->code); |
256 |
g_autofree gchar *locale = get_locale_name (priv->code); |
| 254 |
if (locale) |
257 |
if (locale) |
| 255 |
{ |
258 |
{ |
|
Lines 264-269
Link Here
|
| 264 |
setlocale (LC_ALL, current); |
267 |
setlocale (LC_ALL, current); |
| 265 |
} |
268 |
} |
| 266 |
if (!priv->territory) |
269 |
if (!priv->territory) |
|
|
270 |
#endif |
| 267 |
{ |
271 |
{ |
| 268 |
g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 3); |
272 |
g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 3); |
| 269 |
priv->territory = g_strdup (tokens[1]); |
273 |
priv->territory = g_strdup (tokens[1]); |
