From 9f7c3b8ea66028f47c4685eb44473c17ea17f105 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 22 Jun 2015 22:35:54 +0200 Subject: fs/Config: remove charset auto-detection via GLib The default is always UTF-8. --- src/fs/Config.cxx | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src') diff --git a/src/fs/Config.cxx b/src/fs/Config.cxx index dd809d8b0..d40fa45cf 100644 --- a/src/fs/Config.cxx +++ b/src/fs/Config.cxx @@ -22,10 +22,6 @@ #include "Charset.hxx" #include "config/ConfigGlobal.hxx" -#ifdef HAVE_GLIB -#include -#endif - bool ConfigureFS(Error &error) { @@ -33,16 +29,6 @@ ConfigureFS(Error &error) const char *charset = nullptr; charset = config_get_string(ConfigOption::FS_CHARSET, nullptr); - if (charset == nullptr) { -#ifdef HAVE_GLIB - const gchar **encodings; - g_get_filename_charsets(&encodings); - - if (encodings[0] != nullptr && *encodings[0] != '\0') - charset = encodings[0]; -#endif - } - return charset == nullptr || SetFSCharset(charset, error); #else (void)error; -- cgit v1.2.3