aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-06-22 22:35:54 +0200
committerMax Kellermann <max@duempel.org>2015-06-22 22:35:54 +0200
commit9f7c3b8ea66028f47c4685eb44473c17ea17f105 (patch)
tree1627301f03c7f209fc2a84d36c424441fa204b78
parent9f4f1bab39d3efa1f2cf1fa9fb861f8d38fdb652 (diff)
downloadmpd-9f7c3b8ea66028f47c4685eb44473c17ea17f105.tar.gz
mpd-9f7c3b8ea66028f47c4685eb44473c17ea17f105.tar.xz
mpd-9f7c3b8ea66028f47c4685eb44473c17ea17f105.zip
fs/Config: remove charset auto-detection via GLib
The default is always UTF-8.
-rw-r--r--src/fs/Config.cxx14
1 files changed, 0 insertions, 14 deletions
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 <glib.h>
-#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;