From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 28 Oct 2008 12:34:35 +0000 (+0100)
Subject: enabling away on detach
X-Git-Tag: 0.3.1~107
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=eab5c456972d723fb3c67fe366548608f3bbeadc

enabling away on detach
---

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 020950f6..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;
@@ -503,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);
+    }
+  }
+}
diff --git a/src/core/coresession.h b/src/core/coresession.h
index d032187d..91ad27e1 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -48,7 +48,7 @@ public:
   ~CoreSession();
 
   QList<BufferInfo> buffers() const;
-  UserId user() const;
+  inline UserId user() const { return _user; }
   CoreNetwork *network(NetworkId) const;
   NetworkConnection *networkConnection(NetworkId) const;
   Identity *identity(IdentityId) const;
@@ -172,6 +172,9 @@ private slots:
 
   void scriptRequest(QString script);
 
+  void clientsConnected();
+  void clientsDisconnected();
+
 private:
   void loadSettings();
   void initScriptEngine();
diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp
index a5ec4f94..8dd9c0d9 100644
--- a/src/qtui/settingspages/identitiessettingspage.cpp
+++ b/src/qtui/settingspages/identitiessettingspage.cpp
@@ -72,7 +72,6 @@ IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
   // we would need this if we enabled drag and drop in the nicklist...
   //connect(ui.nicknameList, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(setWidgetStates()));
   //connect(ui.nicknameList->model(), SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(nicklistHasChanged()));
-
 }
 
 void IdentitiesSettingsPage::setWidgetStates() {
@@ -86,9 +85,6 @@ void IdentitiesSettingsPage::setWidgetStates() {
     ui.nickDown->setDisabled(true);
   }
   ui.deleteNick->setEnabled(ui.nicknameList->count() > 1);
-
-  // FIXME this is until stuff has been implemented
-  ui.detachAwayEnabled->setEnabled(false);
 }
 
 void IdentitiesSettingsPage::coreConnectionStateChanged(bool state) {