summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Koller <kollix@aon.at>2016-11-06 20:21:22 (GMT)
committerMartin Koller <kollix@aon.at>2016-11-06 20:21:22 (GMT)
commitc8ae486e9a08e9d54f4b9b46341477aa660dccb4 (patch)
treefe8eb5ea9a8a1c46c879ce9bc09e1d9df6806e8c
parent53e3e69f5417496386ca2eac8c251ce5205372b4 (diff)
fix missing / char in constructing default socket path
REVIEW: 129350
-rw-r--r--src/core/connection.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/connection.cpp b/src/core/connection.cpp
index 231aea4..cb1b840 100644
--- a/src/core/connection.cpp
+++ b/src/core/connection.cpp
@@ -127,10 +127,10 @@ void Connection::doReconnect()
const QString defaultSocketDir = StandardDirs::saveDir("data");
if (mConnectionType == CommandConnection) {
- const QString defaultSocketPath = defaultSocketDir % QStringLiteral("akonadiserver-cmd.socket");
+ const QString defaultSocketPath = defaultSocketDir % QStringLiteral("/akonadiserver-cmd.socket");
serverAddress = connectionSettings.value(QStringLiteral("Data/UnixPath"), defaultSocketPath).toString();
} else if (mConnectionType == NotificationConnection) {
- const QString defaultSocketPath = defaultSocketDir % QStringLiteral("akonadiserver-ntf.socket");
+ const QString defaultSocketPath = defaultSocketDir % QStringLiteral("/akonadiserver-ntf.socket");
serverAddress = connectionSettings.value(QStringLiteral("Notifications/UnixPath"), defaultSocketPath).toString();
}
}
@@ -141,7 +141,7 @@ void Connection::doReconnect()
mSocket = new QLocalSocket(this);
connect(mSocket, static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error), this,
[this](QLocalSocket::LocalSocketError) {
- qCWarning(AKONADICORE_LOG) << mSocket->errorString();
+ qCWarning(AKONADICORE_LOG) << mSocket->errorString() << mSocket->serverName();
Q_EMIT socketError(mSocket->errorString());
Q_EMIT socketDisconnected();
});