diff options
author | Andrea Cimitan <andrea.cimitan@gmail.com> | 2014-05-12 12:32:49 +0100 |
---|---|---|
committer | Andrea Cimitan <andrea.cimitan@gmail.com> | 2014-05-12 12:32:49 +0100 |
commit | b7edc8049afdcfbb6dd5bf3bc3d3bdd82606f1fa (patch) | |
tree | 98efa61da9a88292ec00b9b819bfc8acc0f93d24 /liblightdm-gobject | |
parent | b3c54e5460ed04532ffba6535e7c69ceaeef3d70 (diff) | |
download | lightdm-b7edc8049afdcfbb6dd5bf3bc3d3bdd82606f1fa.tar.gz |
Remove unwanted mod
Diffstat (limited to 'liblightdm-gobject')
-rw-r--r-- | liblightdm-gobject/language.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/liblightdm-gobject/language.c b/liblightdm-gobject/language.c index 9f4c183c..4dce374a 100644 --- a/liblightdm-gobject/language.c +++ b/liblightdm-gobject/language.c @@ -40,7 +40,7 @@ static GList *languages = NULL; static void update_languages (void) { - gchar *command = "/usr/share/language-tools/language-options"; + gchar *command = "locale -a"; gchar *stdout_text = NULL, *stderr_text = NULL; gint exit_status; gboolean result; @@ -161,39 +161,15 @@ lightdm_get_language (void) { const gchar *lang; GList *link; - static const gchar *short_lang = NULL; - - if (short_lang) - goto match; lang = g_getenv ("LANG"); if (!lang) return NULL; - /* Convert to a short form language code */ - gchar *command = g_strconcat ("/usr/share/language-tools/language-validate ", lang, NULL); - gchar *out; - GError *error = NULL; - if (g_spawn_command_line_sync (command, &out, NULL, NULL, &error)) - { - short_lang = g_strdup (g_strchomp (out)); - g_free (out); - g_free (command); - } - else - { - g_warning ("Failed to run '%s': %s", command, error->message); - g_error_free (error); - g_free (command); - return NULL; - } - -match: - for (link = lightdm_get_languages (); link; link = link->next) { LightDMLanguage *language = link->data; - if (lightdm_language_matches (language, short_lang)) + if (lightdm_language_matches (language, lang)) return language; } |