From 3c7cf94643bc45237d1e61c4e6015d498e4400b0 Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Thu, 24 Jan 2013 02:26:38 +0600 Subject: Path: convert fs_charset_to_utf8() to static method Path::ToUTF8() --- src/InotifyUpdate.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/InotifyUpdate.cxx') diff --git a/src/InotifyUpdate.cxx b/src/InotifyUpdate.cxx index ca6db6807..94bff9d4c 100644 --- a/src/InotifyUpdate.cxx +++ b/src/InotifyUpdate.cxx @@ -289,14 +289,14 @@ mpd_inotify_callback(int wd, unsigned mask, (mask & (IN_CREATE|IN_ISDIR)) == (IN_CREATE|IN_ISDIR))) { /* a file was changed, or a directory was moved/deleted: queue a database update */ - char *uri_utf8 = uri_fs != NULL - ? fs_charset_to_utf8(uri_fs) - : g_strdup(""); - if (uri_utf8 != NULL) { - inotify_queue->Enqueue(uri_utf8); - g_free(uri_utf8); + if (uri_fs != nullptr) { + const std::string uri_utf8 = Path::ToUTF8(uri_fs); + if (!uri_utf8.empty()) + inotify_queue->Enqueue(uri_utf8.c_str()); } + else + inotify_queue->Enqueue(""); } g_free(uri_fs); -- cgit v1.2.3