From eea8926b61889ea80c76f9fb6b5bf5d1afe6c6eb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 27 Dec 2013 18:53:50 +0000 Subject: old nasty perversion EVENTTYPE_STATUSCHANGE removed forever git-svn-id: http://svn.miranda-ng.org/main/trunk@7396 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Variables/src/parse_miranda.cpp | 15 +++++++-------- plugins/Variables/src/parse_miranda.h | 5 ----- 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'plugins/Variables/src') diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp index 42a4b81402..d22b206534 100644 --- a/plugins/Variables/src/parse_miranda.cpp +++ b/plugins/Variables/src/parse_miranda.cpp @@ -489,14 +489,13 @@ static BOOL isValidDbEvent(DBEVENTINFO *dbe, int flags) { BOOL bEventType, bEventFlags; - bEventType = ((dbe->eventType == EVENTTYPE_MESSAGE) && (flags&DBE_MESSAGE)) || - ((dbe->eventType == EVENTTYPE_URL) && (flags&DBE_URL)) || - ((dbe->eventType == EVENTTYPE_CONTACTS) && (flags&DBE_CONTACTS)) || - ((dbe->eventType == EVENTTYPE_ADDED) && (flags&DBE_ADDED)) || - ((dbe->eventType == EVENTTYPE_AUTHREQUEST) && (flags&DBE_AUTHREQUEST)) || - ((dbe->eventType == EVENTTYPE_FILE) && (flags&DBE_FILE)) || - ((dbe->eventType == EVENTTYPE_STATUSCHANGE) && (flags&DBE_STATUSCHANGE)) || - ((flags&DBE_OTHER)); + bEventType = ((dbe->eventType == EVENTTYPE_MESSAGE) && (flags & DBE_MESSAGE)) || + ((dbe->eventType == EVENTTYPE_URL) && (flags & DBE_URL)) || + ((dbe->eventType == EVENTTYPE_CONTACTS) && (flags & DBE_CONTACTS)) || + ((dbe->eventType == EVENTTYPE_ADDED) && (flags & DBE_ADDED)) || + ((dbe->eventType == EVENTTYPE_AUTHREQUEST) && (flags & DBE_AUTHREQUEST)) || + ((dbe->eventType == EVENTTYPE_FILE) && (flags & DBE_FILE)) || + ((flags & DBE_OTHER)); bEventFlags = (dbe->flags&DBEF_SENT)?(flags&DBE_SENT):(flags&DBE_RCVD); bEventFlags = (bEventFlags && ((dbe->flags&DBEF_READ)?(flags&DBE_READ):(flags&DBE_UNREAD))); diff --git a/plugins/Variables/src/parse_miranda.h b/plugins/Variables/src/parse_miranda.h index 16b7e68f41..d945e93ce8 100644 --- a/plugins/Variables/src/parse_miranda.h +++ b/plugins/Variables/src/parse_miranda.h @@ -78,11 +78,6 @@ DBE_MESSAGE|DBE_URL|DBE_CONTACTS|DBE_ADDED|DBE_AUTHREQUEST|DBE_FILE|DBE_OTHER #define DBE_ADDED 0x00000800 // pBlob = 'some format', no string #define DBE_AUTHREQUEST 0x00001000 // pBlob = message #define DBE_FILE 0x00002000 // pBlob = DWORD + file + description -#define DBE_STATUSCHANGE 0x00004000 // pBlob = description #define DBE_OTHER 0x00008000 #define DBE_ANYTYPE (DBE_MESSAGE|DBE_URL|DBE_CONTACTS|DBE_ADDED|DBE_AUTHREQUEST|DBE_FILE|DBE_STATUSCHANGE|DBE_OTHER) #define DBE_ANYFIRSTUNREAD (DBE_ANYTYPE|DBE_UNREAD|DBE_RCVD) - -#ifndef EVENTTYPE_STATUSCHANGE -#define EVENTTYPE_STATUSCHANGE 25368 -#endif -- cgit v1.2.3