X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=0dd335876f69da4bfddfd7bd9bf7ce12ef8ed362;hb=eab5c456972d723fb3c67fe366548608f3bbeadc;hp=ded76eff0c7d302cf69cebfa4df9c310c86c08cc;hpb=5c35ac3ee6f951d39cc052925aa224debfa148a8;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index ded76eff..0dd33587 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -57,6 +57,9 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   SignalProxy *p = signalProxy();
   connect(p, SIGNAL(peerRemoved(QIODevice *)), this, SLOT(removeClient(QIODevice *)));
 
+  connect(p, SIGNAL(connected()), this, SLOT(clientsConnected()));
+  connect(p, SIGNAL(disconnected()), this, SLOT(clientsDisconnected()));
+
   //p->attachSlot(SIGNAL(disconnectFromNetwork(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); // FIXME
   p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromClient(BufferInfo, QString)));
   p->attachSignal(this, SIGNAL(displayMsg(Message)));
@@ -116,10 +119,6 @@ CoreSession::~CoreSession() {
   }
 }
 
-UserId CoreSession::user() const {
-  return _user;
-}
-
 CoreNetwork *CoreSession::network(NetworkId id) const {
   if(_networks.contains(id)) return _networks[id];
   return 0;
@@ -229,11 +228,13 @@ void CoreSession::disconnectFromNetwork(NetworkId id) {
 void CoreSession::networkStateRequested() {
 }
 
-void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it in signal connections
-  QIODevice *device = qobject_cast<QIODevice *>(dev);
+void CoreSession::addClient(QIODevice *device) {
   if(!device) {
     quError() << "Invoking CoreSession::addClient with a QObject that is not a QIODevice!";
   } else {
+    // if the socket is an orphan, the signalProxy adopts it.
+    // -> we don't need to care about it anymore
+    device->setParent(0);
     signalProxy()->addPeer(device);
     QVariantMap reply;
     reply["MsgType"] = "SessionInit";
@@ -242,11 +243,15 @@ void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it
   }
 }
 
+void CoreSession::addClient(SignalProxy *proxy) {
+  signalProxy()->addPeer(proxy);
+  emit sessionState(sessionState());
+}
+
 void CoreSession::removeClient(QIODevice *iodev) {
   QTcpSocket *socket = qobject_cast<QTcpSocket *>(iodev);
   if(socket)
     quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));
-  iodev->deleteLater();
 }
 
 SignalProxy *CoreSession::signalProxy() const {
@@ -497,3 +502,65 @@ void CoreSession::renameBuffer(const NetworkId &networkId, const QString &newNam
     emit bufferRenamed(bufferId, newName);
   }
 }
+
+void CoreSession::clientsConnected() {
+  QHash<NetworkId, NetworkConnection *>::iterator conIter = _connections.begin();
+  Identity *identity = 0;
+  NetworkConnection *con = 0;
+  Network *network = 0;
+  IrcUser *me = 0;
+  QString awayReason;
+  while(conIter != _connections.end()) {
+    con = *conIter;
+    conIter++;
+
+    if(!con->isConnected())
+      continue;
+    identity = con->identity();
+    if(!identity)
+      continue;
+    network = con->network();
+    if(!network)
+      continue;
+    me = network->me();
+    if(!me)
+      continue;
+
+    if(identity->detachAwayEnabled() && me->isAway()) {
+      con->userInputHandler()->handleAway(BufferInfo(), QString());
+    }
+  }
+}
+
+void CoreSession::clientsDisconnected() {
+  QHash<NetworkId, NetworkConnection *>::iterator conIter = _connections.begin();
+  Identity *identity = 0;
+  NetworkConnection *con = 0;
+  Network *network = 0;
+  IrcUser *me = 0;
+  QString awayReason;
+  while(conIter != _connections.end()) {
+    con = *conIter;
+    conIter++;
+
+    if(!con->isConnected())
+      continue;
+    identity = con->identity();
+    if(!identity)
+      continue;
+    network = con->network();
+    if(!network)
+      continue;
+    me = network->me();
+    if(!me)
+      continue;
+
+    if(identity->detachAwayEnabled() && !me->isAway()) {
+      if(identity->detachAwayReasonEnabled())
+	awayReason = identity->detachAwayReason();
+      else
+	awayReason = identity->awayReason();
+      con->userInputHandler()->handleAway(BufferInfo(), awayReason);
+    }
+  }
+}