X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=a00e4f498ecd1e72a2dfe279f7abeb691f90d9c0;hp=0369c213be0408201ab6f5e94fa093836413838b;hb=59912f14782c193a2394a2b0d044902a59c96870;hpb=25d9ab403582dc24fffe7d4d38e92754898f7384 diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp index 0369c213..a00e4f49 100644 --- a/src/core/networkconnection.cpp +++ b/src/core/networkconnection.cpp @@ -46,7 +46,7 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session, con connect(network, SIGNAL(currentServerSet(const QString &)), this, SLOT(sendPerform())); connect(&socket, SIGNAL(connected()), this, SLOT(socketConnected())); - //connect(&socket, SIGNAL(disconnected()), this, SLOT(quit())); FIXME + connect(&socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected())); connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError))); connect(&socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(socketStateChanged(QAbstractSocket::SocketState))); connect(&socket, SIGNAL(readyRead()), this, SLOT(socketHasData())); @@ -137,7 +137,7 @@ void NetworkConnection::connectToIrc() { } // TODO implement cycling / random servers - QString host = serverList[0]["Address"].toString(); + QString host = serverList[0]["Host"].toString(); quint16 port = serverList[0]["Port"].toUInt(); displayStatusMsg(QString("Connecting to %1:%2...").arg(host).arg(port)); socket.connectToHost(host, port); @@ -204,6 +204,10 @@ void NetworkConnection::socketStateChanged(QAbstractSocket::SocketState state) { //qDebug() << "Socket state changed: " << state; } +void NetworkConnection::socketDisconnected() { + emit disconnected(networkId()); +} + // FIXME switch to BufferId void NetworkConnection::userInput(QString buf, QString msg) { userInputHandler()->handleUserInput(buf, msg);