projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't send WHO if we haven't received a reply for the last one yet
[quassel.git]
/
src
/
core
/
corenetwork.h
diff --git
a/src/core/corenetwork.h
b/src/core/corenetwork.h
index
6c6f978
..
c11aee8
100644
(file)
--- a/
src/core/corenetwork.h
+++ b/
src/core/corenetwork.h
@@
-75,7
+75,7
@@
public:
inline QString channelKey(const QString &channel) const { return _channelKeys.value(channel.toLower(), QString()); }
inline QString channelKey(const QString &channel) const { return _channelKeys.value(channel.toLower(), QString()); }
- inline bool isAutoWhoInProgress(const QString &channel) const { return _autoWho
InProgress
.value(channel.toLower(), 0); }
+ inline bool isAutoWhoInProgress(const QString &channel) const { return _autoWho
Pending
.value(channel.toLower(), 0); }
inline UserId userId() const { return _coreSession->user(); }
inline UserId userId() const { return _coreSession->user(); }
@@
-91,7
+91,7
@@
public slots:
virtual void setAutoReconnectRetries(quint16);
void connectToIrc(bool reconnecting = false);
virtual void setAutoReconnectRetries(quint16);
void connectToIrc(bool reconnecting = false);
- void disconnectFromIrc(bool requested = true, const QString &reason = QString());
+ void disconnectFromIrc(bool requested = true, const QString &reason = QString()
, bool withReconnect = false
);
void userInput(BufferInfo bufferInfo, QString msg);
void putRawLine(QByteArray input);
void userInput(BufferInfo bufferInfo, QString msg);
void putRawLine(QByteArray input);
@@
-106,6
+106,8
@@
public slots:
Server usedServer() const;
Server usedServer() const;
+ inline void resetPingTimeout() { _lastPingTime = 0; }
+
signals:
void recvRawServerMsg(QString);
void displayStatusMsg(QString);
signals:
void recvRawServerMsg(QString);
void displayStatusMsg(QString);
@@
-132,6
+134,8
@@
private slots:
void restoreUserModes();
void doAutoReconnect();
void sendPing();
void restoreUserModes();
void doAutoReconnect();
void sendPing();
+ void enablePingTimeout();
+ void disablePingTimeout();
void sendAutoWho();
void startAutoWhoCycle();
void sendAutoWho();
void startAutoWhoCycle();
@@
-167,15
+171,17
@@
private:
* it is needed to determine whether or not the connection needs to be
* in the automatic session restore. */
bool _quitRequested;
* it is needed to determine whether or not the connection needs to be
* in the automatic session restore. */
bool _quitRequested;
+ QString _quitReason;
bool _previousConnectionAttemptFailed;
int _lastUsedServerIndex;
QTimer _pingTimer;
bool _previousConnectionAttemptFailed;
int _lastUsedServerIndex;
QTimer _pingTimer;
+ uint _lastPingTime;
bool _autoWhoEnabled;
QStringList _autoWhoQueue;
bool _autoWhoEnabled;
QStringList _autoWhoQueue;
- QHash<QString, int> _autoWho
InProgress
;
+ QHash<QString, int> _autoWho
Pending
;
int _autoWhoInterval;
int _autoWhoNickLimit;
int _autoWhoDelay;
int _autoWhoInterval;
int _autoWhoNickLimit;
int _autoWhoDelay;