projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trim incoming lines again, apparently allowing trailing spaces has weird side-effect...
[quassel.git]
/
src
/
core
/
core.cpp
diff --git
a/src/core/core.cpp
b/src/core/core.cpp
index
8a1c777
..
dad499a
100644
(file)
--- a/
src/core/core.cpp
+++ b/
src/core/core.cpp
@@
-292,9
+292,9
@@
QList<Message> Core::requestMsgRange(UserId user, BufferId buffer, int first, in
return instance()->storage->requestMsgRange(user, buffer, first, last);
}
return instance()->storage->requestMsgRange(user, buffer, first, last);
}
-QList<BufferInfo> Core::requestBuffers(UserId user
, QDateTime since
) {
+QList<BufferInfo> Core::requestBuffers(UserId user) {
QMutexLocker locker(&mutex);
QMutexLocker locker(&mutex);
- return instance()->storage->requestBuffers(user
, since
);
+ return instance()->storage->requestBuffers(user);
}
bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) {
}
bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) {
@@
-468,7
+468,7
@@
void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
}
reply["MsgType"] = "ClientLoginAck";
SignalProxy::writeDataToDevice(socket, reply);
}
reply["MsgType"] = "ClientLoginAck";
SignalProxy::writeDataToDevice(socket, reply);
- qDebug() << qPrintable(tr("Client %1 initialized and authentificated successfully as \"%2\"
.").arg(socket->peerAddress().toString(), msg["User"].toString
()));
+ qDebug() << qPrintable(tr("Client %1 initialized and authentificated successfully as \"%2\"
(UserId: %3).").arg(socket->peerAddress().toString(), msg["User"].toString()).arg(uid.toInt
()));
setupClientSession(socket, uid);
}
}
setupClientSession(socket, uid);
}
}