StatusManager:

- all protocol data really merged together;
- duplicated settings arrays removed;
- stupid protoList removed;
- fixed #1119;
- version bump

1 files changed, 2 insertions, 50 deletions

diff --git a/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h b/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h
index 8ba6e3f606..b6ca5cbeb6 100644
--- a/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h
+++ b/plugins/StatusManager/src/AdvancedAutoAway/advancedautoaway.h
@@ -33,61 +33,13 @@
 #define SETTING_NATIME_DEFAULT  20
 #define SETTING_AWAYCHECKTIMEINSECS "CheckInterval"
 
-#define STATUS_RESET    1
-#define STATUS_AUTOAWAY 2
-#define STATUS_AUTONA   3
-
 #define SETTING_MONITORMOUSE    "MonitorMouse"
 #define SETTING_MONITORKEYBOARD "MonitorKeyboard"
 
-#define FLAG_ONSAVER        0x0001 // db: set lv1 status on screensaver ?
-#define FLAG_ONMOUSE        0x0002 // db: set after inactivity ?
-#define FLAG_SETNA          0x0004 // db: set NA after xx of away time ?
-#define FLAG_CONFIRM        0x0008 // db: show confirm dialog ?
-#define FLAG_RESET          0x0010 // db: restore status ?
-#define FLAG_LV2ONINACTIVE  0x0020 // db: set lv2 only on inactivity
-#define FLAG_MONITORMIRANDA 0x0040 // db: monitor miranda activity only
-#define FLAG_ONLOCK         0x0080 // db: on work station lock
-#define FLAG_FULLSCREEN     0x0100 // db: on full screen
-
-typedef enum
-{
-	ACTIVE, // user is active
-	STATUS1_SET, // first status change happened
-	STATUS2_SET, // second status change happened
-	SET_ORGSTATUS, // user was active again, original status will be restored
-	HIDDEN_ACTIVE // user is active, but this is not shown to the outside world
-} STATES;
-
-struct TAAAProtoSetting : public PROTOCOLSETTINGEX, public MZeroedObject
-{
-	TAAAProtoSetting(PROTOACCOUNT *pa);
-	~TAAAProtoSetting();
-
-	int originalStatusMode;
-	STATES
-		oldState,
-		curState;
-	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
-	unsigned int sts1setTimer;
-};
-
-int AAACompareSettings(const TAAAProtoSetting *p1, const TAAAProtoSetting *p2);
-
 void AdvancedAutoAwayLoad();
 void AdvancedAutoAwayUnload();
 
-typedef OBJLIST<TAAAProtoSetting> TAAAProtoSettingList;
-extern TAAAProtoSettingList autoAwaySettings;
-
-int  LoadAutoAwaySetting(TAAAProtoSetting &autoAwaySetting, char *protoName);
-void AAALoadOptions(TAAAProtoSettingList &settings, bool override);
+int  LoadAutoAwaySetting(SMProto&, char *protoName);
+void AAALoadOptions();
 
 #endif