projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing BR #147. Needs core update.
[quassel.git]
/
src
/
core
/
core.cpp
diff --git
a/src/core/core.cpp
b/src/core/core.cpp
index
ebfe491
..
c92c4f1
100644
(file)
--- a/
src/core/core.cpp
+++ b/
src/core/core.cpp
@@
-309,6
+309,11
@@
QList<BufferInfo> Core::requestBuffers(UserId user) {
return instance()->storage->requestBuffers(user);
}
return instance()->storage->requestBuffers(user);
}
+QList<BufferId> Core::requestBufferIdsForNetwork(UserId user, NetworkId networkId) {
+ QMutexLocker locker(&mutex);
+ return instance()->storage->requestBufferIdsForNetwork(user, networkId);
+}
+
bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) {
QMutexLocker locker(&mutex);
return instance()->storage->removeBuffer(user, bufferId);
bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) {
QMutexLocker locker(&mutex);
return instance()->storage->removeBuffer(user, bufferId);
@@
-333,7
+338,7
@@
QHash<BufferId, MsgId> Core::bufferLastSeenMsgIds(UserId user) {
bool Core::startListening(uint port) {
if(!server.listen(QHostAddress::Any, port)) {
bool Core::startListening(uint port) {
if(!server.listen(QHostAddress::Any, port)) {
- qWarning(qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString())));
+ qWarning(
"%s",
qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString())));
return false;
}
qDebug() << "Listening for GUI clients on port" << server.serverPort();
return false;
}
qDebug() << "Listening for GUI clients on port" << server.serverPort();
@@
-386,8
+391,8
@@
void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
QVariantMap reply;
// Just version information -- check it!
QVariantMap reply;
// Just version information -- check it!
- if(
msg.contains("ClientBuild") && msg["ClientBuild"].toUInt() < 732
- ||
!msg.contains("ClientBuild") && msg["ProtocolVersion"].toUInt() < Global::coreNeedsProtocol
) {
+ if(
(msg.contains("ClientBuild") && msg["ClientBuild"].toUInt() < 732)
+ ||
(!msg.contains("ClientBuild") && msg["ProtocolVersion"].toUInt() < Global::coreNeedsProtocol)
) {
reply["MsgType"] = "ClientInitReject";
reply["Error"] = tr("<b>Your Quassel Client is too old!</b><br>"
"This core needs at least client/core protocol version %1.<br>"
reply["MsgType"] = "ClientInitReject";
reply["Error"] = tr("<b>Your Quassel Client is too old!</b><br>"
"This core needs at least client/core protocol version %1.<br>"