X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.h;h=649171dbf048219ca134b91a0efaae3a2c1aa539;hp=f9db515461087f2cfd6c3a15ae4715baf0e14b8c;hb=cd0868fff76dd067470881134fd736e1a1d97e71;hpb=da3aa4136fe01e142238f0f42fe1273481037b9d

diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index f9db5154..649171db 100644
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -77,17 +77,20 @@ public:
   //! Encode a string using the user-specific encoding, if set, and use the standard encoding else.
   QByteArray userEncode(const QString &userNick, const QString &string) const;
 
-  inline QString channelKey(const QString &channel) const { return _channelKeys.value(channel, QString()); }
+  inline QString channelKey(const QString &channel) const { return _channelKeys.value(channel.toLower(), QString()); }
+  inline QStringList persistentChannels() const { return _channelKeys.keys(); }
 
 public slots:
   // void setServerOptions();
   void connectToIrc(bool reconnecting = false);
-  void disconnectFromIrc();
+  void disconnectFromIrc(bool requested = true);
   void userInput(BufferInfo bufferInfo, QString msg);
 
   void putRawLine(QByteArray input);
   void putCmd(const QString &cmd, const QVariantList &params, const QByteArray &prefix = QByteArray());
 
+  void setChannelJoined(const QString &channel);
+  void setChannelParted(const QString &channel);
   void addChannelKey(const QString &channel, const QString &key);
   void removeChannelKey(const QString &channel);
 
@@ -95,6 +98,7 @@ private slots:
   void sendPerform();
   void autoReconnectSettingsChanged();
   void doAutoReconnect();
+  void sendWho();
   void nickChanged(const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
 
 signals:
@@ -113,6 +117,8 @@ signals:
 
   //void queryRequested(QString network, QString nick);
   void nickChanged(const NetworkId &networkId, const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
+  void channelJoined(NetworkId, const QString &channel, const QString &key = QString());
+  void channelParted(NetworkId, const QString &channel);
 
 private slots:
   void socketHasData();
@@ -129,15 +135,22 @@ private:
 
   Network *_network;
   CoreSession *_coreSession;
+  BufferInfo _statusBufferInfo;
 
   IrcServerHandler *_ircServerHandler;
   UserInputHandler *_userInputHandler;
   CtcpHandler *_ctcpHandler;
 
-  QHash<QString, QString> _channelKeys;
+  QHash<QString, QString> _channelKeys;  // stores persistent channels and their passwords, if any
+
   QTimer _autoReconnectTimer;
   int _autoReconnectCount;
 
+  QTimer _whoTimer;
+
+  bool _previousConnectionAttemptFailed;
+  int _lastUsedServerlistIndex;
+  
   class ParseError : public Exception {
   public:
     ParseError(QString cmd, QString prefix, QStringList params);