oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/Config: remove charset auto-detection via GLib

Browse Source 
The default is always UTF-8.
This commit is contained in:
Max Kellermann 2015-06-22 22:35:54 +02:00
parent 9f4f1bab39
commit 9f7c3b8ea6
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/fs/Config.cxx
View File

@ -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)
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;