[Pkg-owncloud-commits] [owncloud-client] 278/498: FileSystem: Use long file name handling method from csync.

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Aug 11 14:48:58 UTC 2015


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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit b8077d2f5b86b035ffdea0552ef19d341fa9f749
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Jul 3 16:26:33 2015 +0200

    FileSystem: Use long file name handling method from csync.
    
    This helps to only maintain one version of the function.
---
 src/libsync/filesystem.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
index ef1b342..f0bd3f0 100644
--- a/src/libsync/filesystem.cpp
+++ b/src/libsync/filesystem.cpp
@@ -42,6 +42,7 @@ extern "C" void csync_win32_set_file_hidden( const char *file, bool h );
 extern "C" {
 #include "csync.h"
 #include "vio/csync_vio_local.h"
+#include "std/c_path.h"
 }
 
 namespace OCC {
@@ -50,9 +51,9 @@ QString FileSystem::longWinPath( const QString& inpath )
 {
     QString path(inpath);
 
-    path.replace('/', '\\');
-    path.prepend(QLatin1String("\\\\?\\"));
-
+#ifdef Q_OS_WIN
+    path = QString::fromWCharArray( static_cast<wchar_t*>( c_utf8_path_to_locale(inpath.toUtf8() ) ) );
+#endif
     return path;
 }
 

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



More information about the Pkg-owncloud-commits mailing list