diff options
| author | George Hazan <ghazan@miranda.im> | 2018-03-04 15:06:19 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-03-04 15:06:19 +0300 |
| commit | f02ba61c1480c33b801aa7f7acefac9e3735c551 (patch) | |
| tree | aa44e2ccfa277bb4b877f867d035e7cabded1f83 /plugins/StatusManager/src/commonstatus.h | |
| parent | c257e17520118623ef8ae6ec7cf57249b4fd9ba0 (diff) | |
StatusManager:
- fixes #1150 (Status Manager no longer reconnects when connection breaks);
- hopefully also fixes #1139 (KeepStatus: option "Reconnect on APM resume" don't work);
- removed major clutch with assigning "" to a protocol name to disable it in the confirmdialog;
- another ancient evil destroyed that tried to save 4 bytes of memory by storing temporary status values in the main status field in AAA;
- version bump
Diffstat (limited to 'plugins/StatusManager/src/commonstatus.h')
| -rw-r--r-- | plugins/StatusManager/src/commonstatus.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/plugins/StatusManager/src/commonstatus.h b/plugins/StatusManager/src/commonstatus.h index 488d28bfb6..ee9fa8b128 100644 --- a/plugins/StatusManager/src/commonstatus.h +++ b/plugins/StatusManager/src/commonstatus.h @@ -106,17 +106,15 @@ struct SMProto : public PROTOCOLSETTINGEX, public MZeroedObject // AdvancedAutoAway settings int originalStatusMode = ID_STATUS_CURRENT; - STATES - oldState, - curState = ACTIVE; - BOOL statusChanged; // AAA changed the status, don't update mStatus - BOOL mStatus; // status changed manually or not ? - int optionFlags, // db: see above - awayTime, // db: time to wait for inactivity - naTime, // db: time to wait after away is set - statusFlags; // db: set lv1 status if this is original status - WORD lv1Status, // db - lv2Status; // db + int aaaStatus; + STATES oldState, curState = ACTIVE; + bool bStatusChanged; // AAA changed the status, don't update bManualStatus + bool bManualStatus; // status changed manually or not ? + int optionFlags; // db: see above + int awayTime; // db: time to wait for inactivity + int naTime; // db: time to wait after away is set + int statusFlags; // db: set lv1 status if this is original status + WORD lv1Status, lv2Status; // db: statuses to switch protocol to unsigned int sts1setTimer; // KeepStatus @@ -124,6 +122,9 @@ struct SMProto : public PROTOCOLSETTINGEX, public MZeroedObject int GetStatus() const; int lastStatusAckTime; // the time the last status ack was received + + // StartupStatus + bool ssDisabled; // prohibits status restoration at startup }; struct TProtoSettings : public OBJLIST<SMProto> |