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/IEView/src/HTMLBuilder.cpp | 4 +--- plugins/IEView/src/HTMLBuilder.h | 1 - plugins/IEView/src/HistoryHTMLBuilder.cpp | 6 ++---- plugins/IEView/src/ScriverHTMLBuilder.cpp | 15 ++++++--------- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 20 ++++++++------------ plugins/IEView/src/TemplateHTMLBuilder.cpp | 2 -- 6 files changed, 17 insertions(+), 31 deletions(-) (limited to 'plugins/IEView/src') diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp index 7dc86f2f19..0c90597923 100644 --- a/plugins/IEView/src/HTMLBuilder.cpp +++ b/plugins/IEView/src/HTMLBuilder.cpp @@ -342,8 +342,6 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) db_event_markRead(event->hContact, hDbEvent); CallService(MS_CLIST_REMOVEEVENT, (WPARAM) event->hContact, (LPARAM) hDbEvent); } - else if (dbei.eventType == EVENTTYPE_STATUSCHANGE) - db_event_markRead(event->hContact, hDbEvent); if (!isDbEventShown(&dbei)) { free(dbei.pBlob); @@ -369,7 +367,7 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) eventData->pszNickW = getContactName(event->hContact, szProto); eventData->bIsMe = FALSE; } - if (dbei.eventType == EVENTTYPE_MESSAGE || dbei.eventType == EVENTTYPE_URL || dbei.eventType == EVENTTYPE_STATUSCHANGE || dbei.eventType == EVENTTYPE_JABBER_CHATSTATES) { + if (dbei.eventType == EVENTTYPE_MESSAGE || dbei.eventType == EVENTTYPE_URL || dbei.eventType == EVENTTYPE_JABBER_CHATSTATES) { DBEVENTGETTEXT temp = { &dbei, DBVT_WCHAR, newEvent.codepage }; WCHAR* pwszEventText = (WCHAR*)CallService(MS_DB_EVENT_GETTEXT,0,(LPARAM)&temp); eventData->pszTextW = mir_tstrdup(pwszEventText); diff --git a/plugins/IEView/src/HTMLBuilder.h b/plugins/IEView/src/HTMLBuilder.h index 9650d60712..a5bdf24329 100644 --- a/plugins/IEView/src/HTMLBuilder.h +++ b/plugins/IEView/src/HTMLBuilder.h @@ -23,7 +23,6 @@ class HTMLBuilder; #ifndef HTMLBUILDER_INCLUDED #define HTMLBUILDER_INCLUDED -#define EVENTTYPE_STATUSCHANGE 25368 #define EVENTTYPE_JABBER_CHATSTATES 2000 #include "IEView.h" diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp index f5870f19ef..93349151da 100644 --- a/plugins/IEView/src/HistoryHTMLBuilder.cpp +++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp @@ -71,10 +71,8 @@ HistoryHTMLBuilder::HistoryHTMLBuilder() { bool HistoryHTMLBuilder::isDbEventShown(DBEVENTINFO * dbei) { switch (dbei->eventType) { - case EVENTTYPE_MESSAGE: - return 1; - case EVENTTYPE_STATUSCHANGE: - return 1; + case EVENTTYPE_MESSAGE: + return 1; } return 1; } diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp index 25b96f76f7..17fd3bc2d3 100644 --- a/plugins/IEView/src/ScriverHTMLBuilder.cpp +++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp @@ -70,15 +70,12 @@ ScriverHTMLBuilder::ScriverHTMLBuilder() { bool ScriverHTMLBuilder::isDbEventShown(DBEVENTINFO * dbei) { switch (dbei->eventType) { - case EVENTTYPE_MESSAGE: - return 1; - case EVENTTYPE_STATUSCHANGE: - // if (dbei->flags & DBEF_READ) return 0; - return 1; - case EVENTTYPE_URL: - return 1; - case EVENTTYPE_FILE: - return 1; + case EVENTTYPE_MESSAGE: + return 1; + case EVENTTYPE_URL: + return 1; + case EVENTTYPE_FILE: + return 1; } return 0; } diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp index bbdbd497c9..ac0e4bb32d 100644 --- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp +++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp @@ -87,18 +87,14 @@ TabSRMMHTMLBuilder::TabSRMMHTMLBuilder() { bool TabSRMMHTMLBuilder::isDbEventShown(DWORD dwFlags, DBEVENTINFO * dbei) { switch (dbei->eventType) { - case EVENTTYPE_MESSAGE: - return 1; - break; - case EVENTTYPE_STATUSCHANGE: - return 1; - break; - case EVENTTYPE_URL: - if(dwFlags & MWF_SHOW_URLEVENTS) return 1; - break; - case EVENTTYPE_FILE: - if(dwFlags & MWF_SHOW_FILEEVENTS) return 1; - break; + case EVENTTYPE_MESSAGE: + return 1; + case EVENTTYPE_URL: + if(dwFlags & MWF_SHOW_URLEVENTS) return 1; + break; + case EVENTTYPE_FILE: + if(dwFlags & MWF_SHOW_FILEEVENTS) return 1; + break; } return 0; } diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp index b48476b063..2a090a77d0 100644 --- a/plugins/IEView/src/TemplateHTMLBuilder.cpp +++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "ieview_common.h" -#define EVENTTYPE_STATUSCHANGE 25368 - TemplateHTMLBuilder::TemplateHTMLBuilder() { iLastEventType = -1; -- cgit v1.2.3