Revert "Disambiguate socket API pathes on Windows with user name"

binary

@@ -1 +1 @@
-Subproject commit a56480559ddda3af36b63bb42cfc6cfe05ebc6db
+Subproject commit ac422574995d2339d98fff552f11450b18d7bcff

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;
-}
+}

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