[Pkg-owncloud-commits] [owncloud-client] 423/470: Revert "Disambiguate socket API pathes on Windows with user name"

[Sandro Knauß]

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 b43a9421d2750ee76ddb637f87c6c4e94d4adfc0
Author: Daniel Molkentin <daniel at molkentin.de>
Date:   Thu Apr 28 13:52:15 2016 +0200

    Revert "Disambiguate socket API pathes on Windows with user name"
---
 binary                                                 |  2 +-
 shell_integration/windows/OCUtil/RemotePathChecker.cpp | 16 ++--------------
 src/gui/socketapi.cpp                                  |  3 +--
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/binary b/binary
index a564805..ac42257 160000
--- a/binary
+++ b/binary
@@ -1 +1 @@
-Subproject commit a56480559ddda3af36b63bb42cfc6cfe05ebc6db
+Subproject commit ac422574995d2339d98fff552f11450b18d7bcff
diff --git a/shell_integration/windows/OCUtil/RemotePathChecker.cpp b/shell_integration/windows/OCUtil/RemotePathChecker.cpp
index d03a383..85b0135 100644
--- a/shell_integration/windows/OCUtil/RemotePathChecker.cpp
+++ b/shell_integration/windows/OCUtil/RemotePathChecker.cpp
@@ -31,24 +31,12 @@
 
 using namespace std;
 
-#define BUFSIZE 512
-
-std::wstring getUserName() {
-    DWORD  len = BUFSIZE;
-    TCHAR  buf[BUFSIZE];
-    if (GetUserName(buf, &len)) {
-        return std::wstring(&buf[0], len);
-    } else {
-        return std::wstring();
-    }
-}
 
 // This code is run in a thread
 void RemotePathChecker::workerThreadLoop()
 {
     auto pipename = std::wstring(L"\\\\.\\pipe\\");
-    pipename += L"ownCloud\\";
-    pipename += getUserName();
+    pipename += L"ownCloud";
 
     bool connected = false;
     CommunicationSocket socket;
@@ -253,4 +241,4 @@ RemotePathChecker::FileState RemotePathChecker::_StrToFileState(const std::wstri
 	}
 
 	return StateNone;
-}
+}
\ No newline at end of file
diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index 0614168..91887f0 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -67,8 +67,7 @@ SocketApi::SocketApi(QObject* parent)
 
     if (Utility::isWindows()) {
         socketPath = QLatin1String("\\\\.\\pipe\\")
-                + QLatin1String("ownCloud") + '\\'
-                + QString::fromLocal8Bit(qgetenv("USERNAME"));
+        + QLatin1String("ownCloud");
         // TODO: once the windows extension supports multiple
         // client connections, switch back to the theme name
         // See issue #2388

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