[Pkg-owncloud-commits] [owncloud-client] 161/171: OS X: Fix the file system watcher ignoring unicode paths #4424

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit f140d3447c43e64626fb70194b65e727925b5181
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Mon Feb 8 13:27:44 2016 +0100

    OS X: Fix the file system watcher ignoring unicode paths #4424
    
    Add a missing string normalization when fetching the path
    from the file system event.
---
 src/gui/folderwatcher_mac.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/folderwatcher_mac.cpp b/src/gui/folderwatcher_mac.cpp
index 9a16538..ada7f10 100644
--- a/src/gui/folderwatcher_mac.cpp
+++ b/src/gui/folderwatcher_mac.cpp
@@ -63,7 +63,7 @@ static void callback(
         qstring.resize(pathLength);
         CFStringGetCharacters(path, CFRangeMake(0, pathLength), reinterpret_cast<UniChar *>(qstring.data()));
 
-        paths.append(qstring);
+        paths.append(qstring.normalized(QString::NormalizationForm_C));
     }
 
     reinterpret_cast<FolderWatcherPrivate*>(clientCallBackInfo)->doNotifyParent(paths);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git