[Pkg-owncloud-commits] [owncloud-client] 52/332: SocketAPI: proper name for pipe on windows

[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 3934fa019e2e3649cf5fc006ace21050901e050b
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Jun 5 12:02:57 2014 +0200

    SocketAPI: proper name for pipe on windows
---
 src/mirall/socketapi.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index 48e4e6f..d94fee7 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -19,6 +19,7 @@
 #include "mirall/folderman.h"
 #include "mirall/folder.h"
 #include "mirall/utility.h"
+#include "mirall/theme.h"
 
 #include <QDebug>
 #include <QUrl>
@@ -31,8 +32,6 @@
 #include <QDir>
 #include <QApplication>
 
-#include "mirall/utility.h"
-
 namespace Mirall {
 
 #define DEBUG qDebug() << "SocketApi: "
@@ -43,7 +42,8 @@ SocketApi::SocketApi(QObject* parent, const QUrl& localFile)
 {
     QString socketPath;
     if (Utility::isWindows()) {
-        socketPath = QLatin1String("\\\\.\\pipe\\");
+        socketPath = QLatin1String("\\\\.\\pipe\\")
+                + Theme::instance()->appName();
     } else {
         socketPath = localFile.toLocalFile();
 
@@ -55,7 +55,7 @@ SocketApi::SocketApi(QObject* parent, const QUrl& localFile)
     if(!_localServer->listen(socketPath)) {
         DEBUG << "can't start server" << socketPath;
     } else {
-        DEBUG << "server started" << socketPath;
+        DEBUG << "server started, listening at " << socketPath;
     }
     connect(_localServer, SIGNAL(newConnection()), this, SLOT(slotNewConnection()));
 

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