summaryrefslogtreecommitdiff
path: root/src/Main.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-23 19:27:08 +0100
committerMax Kellermann <max@duempel.org>2014-02-24 20:39:37 +0100
commit33fc3af775ca35ae343a4e50de36e8853cabb86d (patch)
treebfa5312e28ae2e62ecb167436ccb62a70250bd0a /src/Main.cxx
parent6d9739165eaf3d81e00f60124cfc48aba509a9a6 (diff)
SongSort, ...: use libicu instead of GLib's g_utf8_*()
Diffstat (limited to 'src/Main.cxx')
-rw-r--r--src/Main.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Main.cxx b/src/Main.cxx
index fe91ed3a2..4c7c6d97c 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -57,6 +57,7 @@
#include "util/Domain.hxx"
#include "thread/Id.hxx"
#include "thread/Slack.hxx"
+#include "lib/icu/Collate.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigData.hxx"
#include "config/ConfigDefaults.hxx"
@@ -405,6 +406,11 @@ int mpd_main(int argc, char *argv[])
#endif
#endif
+ if (!IcuCollateInit(error)) {
+ LogError(error);
+ return EXIT_FAILURE;
+ }
+
winsock_init();
io_thread_init();
config_global_init();
@@ -651,6 +657,8 @@ int mpd_main(int argc, char *argv[])
WSACleanup();
#endif
+ IcuCollateFinish();
+
log_deinit();
return EXIT_SUCCESS;
}