X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=79c6c0434778ec428f8bf937f9b7931e8080b3fd;hp=a461d262e987ea8f34b6cd5fc50ca46fd01c98c0;hb=1e89816f3a0fbc6c6045ee244df752bd4f403aec;hpb=90ee8b5c90923a3d4a48fc5493ca999e9d0d6a97 diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp index a461d262..79c6c043 100644 --- a/src/core/networkconnection.cpp +++ b/src/core/networkconnection.cpp @@ -49,7 +49,7 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session) : Q _previousConnectionAttemptFailed = false; _lastUsedServerlistIndex = 0; // TODO make configurable - _whoTimer.setInterval(60 * 1000); + _whoTimer.setInterval(90 * 1000); _whoTimer.setSingleShot(false); QHash channels = coreSession()->persistentChannels(networkId()); @@ -234,8 +234,10 @@ void NetworkConnection::networkInitialized(const QString ¤tServer) { setConnectionState(Network::Initialized); network()->setConnected(true); emit connected(networkId()); - sendWho(); - _whoTimer.start(); + if(!Global::SPUTDEV) { + sendWho(); + _whoTimer.start(); + } } void NetworkConnection::sendPerform() { @@ -280,11 +282,6 @@ void NetworkConnection::disconnectFromIrc(bool requested) { void NetworkConnection::socketHasData() { while(socket.canReadLine()) { QByteArray s = socket.readLine().trimmed(); - // FIXME debug - if(Global::SPUTDEV && s == lastMsgReceived) { - qWarning() << "NetworkConnection::socketHasData(): Message repeated! -> loop?"; - } - lastMsgReceived = s; ircServerHandler()->handleServerMsg(s); } } @@ -410,6 +407,7 @@ void NetworkConnection::userInput(BufferInfo buf, QString msg) { void NetworkConnection::putRawLine(QByteArray s) { s += "\r\n"; socket.write(s); + if(Global::SPUTDEV) qDebug() << "SENT:" << s; } void NetworkConnection::putCmd(const QString &cmd, const QVariantList ¶ms, const QByteArray &prefix) {