X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=a00e4f498ecd1e72a2dfe279f7abeb691f90d9c0;hb=1a98ddcc3c275184927bf01ac56d0afd265230cb;hp=21e7f630118fad4bc52826282bdded41ed3e4615;hpb=d1b6499b0b848d4287efae89107576548533502c;p=quassel.git

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 21e7f630..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()));
+  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()));
@@ -63,7 +63,7 @@ bool NetworkConnection::isConnected() const {
   return socket.state() == QAbstractSocket::ConnectedState;
 }
 
-uint NetworkConnection::networkId() const {
+NetworkId NetworkConnection::networkId() const {
   return network()->networkId();
 }
 
@@ -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);
@@ -183,6 +183,7 @@ void NetworkConnection::socketHasData() {
 }
 
 void NetworkConnection::socketError( QAbstractSocket::SocketError err ) {
+  Q_UNUSED(err);
   qDebug() << "Socket Error!";
 }
 
@@ -199,9 +200,14 @@ void NetworkConnection::socketConnected() {
 }
 
 void NetworkConnection::socketStateChanged(QAbstractSocket::SocketState state) {
+  Q_UNUSED(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);