mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 05:40:30 -04:00
ce4ac09b17
- Update PAM file to include system defaults - Set PATH to default from /etc/login.conf - Don't pass-through empty PATH from lightdm to X11 (breaks runtime)
82 lines
2.8 KiB
C
82 lines
2.8 KiB
C
https://bugs.launchpad.net/lightdm/+bug/790186
|
|
|
|
--- liblightdm-gobject/language.c.orig 2016-12-09 01:04:48 UTC
|
|
+++ liblightdm-gobject/language.c
|
|
@@ -57,6 +57,12 @@ G_DEFINE_TYPE (LightDMLanguage, lightdm_language, G_TY
|
|
static gboolean have_languages = FALSE;
|
|
static GList *languages = NULL;
|
|
|
|
+static gboolean
|
|
+is_utf8 (const gchar *code)
|
|
+{
|
|
+ return g_strrstr (code, ".utf8") || g_strrstr (code, ".UTF-8");
|
|
+}
|
|
+
|
|
static void
|
|
update_languages (void)
|
|
{
|
|
@@ -93,7 +99,7 @@ update_languages (void)
|
|
continue;
|
|
|
|
/* Ignore the non-interesting languages */
|
|
- if (strcmp (command, "locale -a") == 0 && !g_strrstr (code, ".utf8"))
|
|
+ if (strcmp (command, "locale -a") == 0 && !is_utf8 (code))
|
|
continue;
|
|
|
|
language = g_object_new (LIGHTDM_TYPE_LANGUAGE, "code", code, NULL);
|
|
@@ -109,12 +115,6 @@ update_languages (void)
|
|
have_languages = TRUE;
|
|
}
|
|
|
|
-static gboolean
|
|
-is_utf8 (const gchar *code)
|
|
-{
|
|
- return g_strrstr (code, ".utf8") || g_strrstr (code, ".UTF-8");
|
|
-}
|
|
-
|
|
/* Get a valid locale name that can be passed to setlocale(), so we always can use nl_langinfo() to get language and country names. */
|
|
static gchar *
|
|
get_locale_name (const gchar *code)
|
|
@@ -154,7 +154,7 @@ get_locale_name (const gchar *code)
|
|
for (i = 0; avail_locales[i]; i++)
|
|
{
|
|
gchar *loc = avail_locales[i];
|
|
- if (!g_strrstr (loc, ".utf8"))
|
|
+ if (!is_utf8 (loc))
|
|
continue;
|
|
if (g_str_has_prefix (loc, language))
|
|
{
|
|
@@ -248,10 +248,16 @@ lightdm_language_get_name (LightDMLanguage *language)
|
|
if (locale)
|
|
{
|
|
gchar *current = setlocale (LC_ALL, NULL);
|
|
+#ifdef LC_IDENTIFICATION
|
|
setlocale (LC_IDENTIFICATION, locale);
|
|
+#endif
|
|
setlocale (LC_MESSAGES, "");
|
|
|
|
+#ifdef _NL_IDENTIFICATION_LANGUAGE
|
|
gchar *language_en = nl_langinfo (_NL_IDENTIFICATION_LANGUAGE);
|
|
+#else
|
|
+ gchar *language_en = "Unknown";
|
|
+#endif
|
|
if (language_en && strlen (language_en) > 0)
|
|
priv->name = g_strdup (dgettext ("iso_639_3", language_en));
|
|
|
|
@@ -291,10 +297,16 @@ lightdm_language_get_territory (LightDMLanguage *langu
|
|
if (locale)
|
|
{
|
|
gchar *current = setlocale (LC_ALL, NULL);
|
|
+#ifdef LC_IDENTIFICATION
|
|
setlocale (LC_IDENTIFICATION, locale);
|
|
+#endif
|
|
setlocale (LC_MESSAGES, "");
|
|
|
|
+#ifdef _NL_IDENTIFICATION_TERRITORY
|
|
gchar *country_en = nl_langinfo (_NL_IDENTIFICATION_TERRITORY);
|
|
+#else
|
|
+ gchar *country_en = "Unknown";
|
|
+#endif
|
|
if (country_en && strlen (country_en) > 0 && g_strcmp0 (country_en, "ISO") != 0)
|
|
priv->territory = g_strdup (dgettext ("iso_3166", country_en));
|
|
|