Skip to content

M
mpd
Commit 9f7c3b8e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

fs/Config: remove charset auto-detection via GLib

The default is always UTF-8.
parent 9f4f1bab
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 14 deletions
src/fs/Config.cxx
View file @ 9f7c3b8e
...@@ -22,10 +22,6 @@ ...@@ -22,10 +22,6 @@
#include "Charset.hxx" #include "Charset.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#ifdef HAVE_GLIB
#include <glib.h>
#endif
bool bool
ConfigureFS(Error &error) ConfigureFS(Error &error)
{ {
...@@ -33,16 +29,6 @@ ConfigureFS(Error &error) ...@@ -33,16 +29,6 @@ ConfigureFS(Error &error)
const char *charset = nullptr; const char *charset = nullptr;
charset = config_get_string(ConfigOption::FS_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); return charset == nullptr || SetFSCharset(charset, error);
#else #else
(void)error; (void)error;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment