[gnome-software] gs-plugin-loader: Stop special-casing UTF-8 codeset in locales
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] gs-plugin-loader: Stop special-casing UTF-8 codeset in locales
- Date: Thu, 24 Oct 2019 12:51:26 +0000 (UTC)
commit 7a413dba1b29c0d9ed690be514bf9d64de6da0d7
Author: Philip Withnall <withnall endlessm com>
Date: Fri Oct 11 11:30:26 2019 +0100
gs-plugin-loader: Stop special-casing UTF-8 codeset in locales
All code which handles locales has to handle codesets anyway, so there
seems to be little point in dropping the `.UTF-8`/`.utf8` codeset but no
others.
Signed-off-by: Philip Withnall <withnall endlessm com>
lib/gs-plugin-loader.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
---
diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
index 02099fd3..12b447df 100644
--- a/lib/gs-plugin-loader.c
+++ b/lib/gs-plugin-loader.c
@@ -2732,19 +2732,13 @@ gs_plugin_loader_init (GsPluginLoader *plugin_loader)
SOUP_SESSION_TIMEOUT, 10,
NULL);
- /* get the locale without the various UTF-8 suffixes */
+ /* get the locale */
tmp = g_getenv ("GS_SELF_TEST_LOCALE");
if (tmp != NULL) {
g_debug ("using self test locale of %s", tmp);
priv->locale = g_strdup (tmp);
} else {
priv->locale = g_strdup (setlocale (LC_MESSAGES, NULL));
- match = g_strstr_len (priv->locale, -1, ".UTF-8");
- if (match != NULL)
- *match = '\0';
- match = g_strstr_len (priv->locale, -1, ".utf8");
- if (match != NULL)
- *match = '\0';
}
/* the settings key sets the initial override */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]