old nasty perversion EVENTTYPE_STATUSCHANGE removed forever

git-svn-id: http://svn.miranda-ng.org/main/trunk@7396 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

24 files changed, 35 insertions, 185 deletions

diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp
index a28d394d90..0ec5f8b5c0 100644
--- a/plugins/BasicHistory/src/EventList.cpp
+++ b/plugins/BasicHistory/src/EventList.cpp
@@ -508,9 +508,6 @@ bool EventList::GetEventIcon(bool isMe, int eventType, int &id)
 	case EVENTTYPE_MESSAGE:

 		id = isMe ? 1 : 0;

 		return true;

-	case EVENTTYPE_STATUSCHANGE:

-		id = 2;

-		return true;

 	case EVENTTYPE_FILE:

 		id = iconsNum;

 		return true;

diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp
index 8a96797e6a..a8db8de746 100644
--- a/plugins/BasicHistory/src/Options.cpp
+++ b/plugins/BasicHistory/src/Options.cpp
@@ -24,7 +24,7 @@ extern HINSTANCE hInst;
 extern bool g_SmileyAddAvail;

 extern bool bPopupsEnabled;

 

-#define MODULE				"BasicHistory"

+#define MODULE "BasicHistory"

 

 Options *Options::instance;

 

@@ -38,7 +38,6 @@ EventNames[] =
 	EVENTTYPE_MESSAGE, LPGENT("Message"),

 	EVENTTYPE_FILE, LPGENT("File transfer"),

 	EVENTTYPE_URL, LPGENT("Link"),

-	EVENTTYPE_STATUSCHANGE, LPGENT("Status change"),

 	EVENTTYPE_AUTHREQUEST, LPGENT("Authorization request"),

 	EVENTTYPE_ADDED, LPGENT("You were added"),

 	EVENTTYPE_CONTACTS, LPGENT("Contacts received"),

diff --git a/plugins/BasicHistory/src/stdafx.h b/plugins/BasicHistory/src/stdafx.h
index 63e485d06a..510afd1c08 100644
--- a/plugins/BasicHistory/src/stdafx.h
+++ b/plugins/BasicHistory/src/stdafx.h
@@ -89,7 +89,6 @@
 #define HISTORY_HK_IMPDAT 116

 #define HISTORY_HK_ALLCONTACTS 117

 

-#define EVENTTYPE_STATUSCHANGE          25368

 #define EVENTTYPE_SMTPSIMPLE            2350

 

 HICON LoadIconEx(int iconId, int big = 0);

diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas
index 69cc3aef2c..821498c4e1 100644
--- a/plugins/HistoryPlusPlus/hpp_events.pas
+++ b/plugins/HistoryPlusPlus/hpp_events.pas
@@ -91,7 +91,6 @@ const
   );

 

 const

-  EVENTTYPE_STATUSCHANGE        = 25368;  // from srmm's

   EVENTTYPE_SMTPSIMPLE          = 2350;   // from SMTP Simple

   EVENTTYPE_NICKNAMECHANGE      = 9001;   // from pescuma

   EVENTTYPE_STATUSMESSAGECHANGE = 9002;   // from pescuma

@@ -185,7 +184,7 @@ type
   end;

 

 var

-  EventTable: array[0..28] of TEventTableItem = (

+  EventTable: array[0..27] of TEventTableItem = (

     // must be the first item in array for unknown events

     (EventType: MaxWord;                         MessageType: mtOther;         TextFunction: GetEventTextForOther),

     // events definitions

@@ -195,7 +194,6 @@ var
     (EventType: EVENTTYPE_AUTHREQUEST;           MessageType: mtSystem;        TextFunction: GetEventTextForAuthRequest),

     (EventType: EVENTTYPE_ADDED;                 MessageType: mtSystem;        TextFunction: GetEventTextForYouWereAdded),

     (EventType: EVENTTYPE_CONTACTS;              MessageType: mtContacts;      TextFunction: GetEventTextForContacts),

-    (EventType: EVENTTYPE_STATUSCHANGE;          MessageType: mtStatus;        TextFunction: GetEventTextForStatusChange),

     (EventType: EVENTTYPE_SMTPSIMPLE;            MessageType: mtSMTPSimple;    TextFunction: GetEventTextForMessage),

     (EventType: ICQEVENTTYPE_SMS;                MessageType: mtSMS;           TextFunction: GetEventTextForSMS),

     (EventType: ICQEVENTTYPE_WEBPAGER;           MessageType: mtWebPager;      TextFunction: GetEventTextForWebPager),

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;

diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp
index 7ee94d423d..877ce7d7c6 100755
--- a/plugins/Msg_Export/src/utils.cpp
+++ b/plugins/Msg_Export/src/utils.cpp
@@ -1426,12 +1426,10 @@ int nExportEvent(WPARAM wparam,LPARAM lparam)
 	}

 

 	if ( !db_event_get(hDbEvent, &dbei)) {

-		if (dbei.eventType != EVENTTYPE_STATUSCHANGE) {

-			char szTemp[500];

-			mir_snprintf(szTemp, SIZEOF(szTemp), "DisableProt_%s", dbei.szModule);

-			if (db_get_b(NULL,MODULE,szTemp,1))

-				ExportDBEventInfo( hContact, dbei);

-		}

+		char szTemp[500];

+		mir_snprintf(szTemp, SIZEOF(szTemp), "DisableProt_%s", dbei.szModule);

+		if (db_get_b(NULL,MODULE,szTemp,1))

+			ExportDBEventInfo( hContact, dbei);

 	}

 	if (dbei.pBlob )

 		free(dbei.pBlob);

diff --git a/plugins/Msg_Export/src/utils.h b/plugins/Msg_Export/src/utils.h
index 276f85c8be..ffb67d2ea0 100755
--- a/plugins/Msg_Export/src/utils.h
+++ b/plugins/Msg_Export/src/utils.h
@@ -20,8 +20,6 @@
 #ifndef MSG_EXP_UTILS_H

 #define MSG_EXP_UTILS_H

 

-#define EVENTTYPE_STATUSCHANGE 25368

-

 #define tstring wstring

 #define _DBGetString _DBGetStringW

 

diff --git a/plugins/NewEventNotify/src/main.cpp b/plugins/NewEventNotify/src/main.cpp
index 600335ac23..e6ccc52c73 100644
--- a/plugins/NewEventNotify/src/main.cpp
+++ b/plugins/NewEventNotify/src/main.cpp
@@ -77,10 +77,6 @@ int HookedNewEvent(WPARAM wParam, LPARAM lParam)
 	if (hContact && ServiceExists(MS_MC_GETMETACONTACT) && CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0))

 		return 0;

 

-	//is it an event info about online/offline status user

-	if (dbe.eventType == 25368)

-		return 0;

-

 	//custom database event types

 	if (ServiceExists(MS_DB_EVENT_GETTYPE)) {

 		DBEVENTTYPEDESCR *pei = (DBEVENTTYPEDESCR*)CallService(MS_DB_EVENT_GETTYPE, (WPARAM)dbe.szModule, (LPARAM)dbe.eventType);

diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index 8add5a6218..1ca031ac7a 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -251,32 +251,8 @@ void LogToMessageWindow(XSTATUSCHANGE *xsc, BOOL opening)
 	ReplaceVars(xsc, Template, templates.LogDelimiter, stzLogText);

 	DBGetStringDefault(xsc->hContact, MODULE, DB_LASTLOG, stzLastLog, SIZEOF(stzLastLog), _T(""));

 

-	if (!opt.KeepInHistory || !(opt.PreventIdentical && _tcscmp(stzLastLog, stzLogText) == 0)) {

+	if (!opt.KeepInHistory || !(opt.PreventIdentical && _tcscmp(stzLastLog, stzLogText) == 0))

 		db_set_ws(xsc->hContact, MODULE, DB_LASTLOG, stzLogText);

-

-		char *blob = mir_utf8encodeT(stzLogText);

-

-		DBEVENTINFO dbei = {0};

-		dbei.cbSize = sizeof(dbei);

-		dbei.cbBlob = (DWORD)strlen(blob) + 1;

-		dbei.pBlob = (PBYTE) blob;

-		dbei.eventType = EVENTTYPE_STATUSCHANGE;

-		dbei.flags = DBEF_READ;

-

-		dbei.flags |= DBEF_UTF;

-

-		dbei.timestamp = (DWORD)time(NULL);

-		dbei.szModule = xsc->szProto;

-		HANDLE hDBEvent = db_event_add(xsc->hContact, &dbei);

-		mir_free(blob);

-

-		if (!opt.KeepInHistory) {

-			DBEVENT *dbevent = (DBEVENT *)mir_alloc(sizeof(DBEVENT));

-			dbevent->hContact = xsc->hContact;

-			dbevent->hDBEvent = hDBEvent;

-			eventList.insert(dbevent);

-		}

-	}

 }

 

 void LogChangeToFile(XSTATUSCHANGE *xsc)

diff --git a/plugins/NewXstatusNotify/src/xstatus.h b/plugins/NewXstatusNotify/src/xstatus.h
index dd2fed81c5..5468d2c5ff 100644
--- a/plugins/NewXstatusNotify/src/xstatus.h
+++ b/plugins/NewXstatusNotify/src/xstatus.h
@@ -43,7 +43,6 @@
 #define XSTATUS_SOUND_REMOVED		"XStatusRemove"

 

 // tabSRMM stuff (logging to message window)

-#define EVENTTYPE_STATUSCHANGE			25368

 #define MS_MSG_MOD_MESSAGEDIALOGOPENED	"SRMsg_MOD/MessageDialogOpened"

 

 // Default templates

diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp
index ab1eb4ad89..2bc4ddbfbb 100644
--- a/plugins/Nudge/src/main.cpp
+++ b/plugins/Nudge/src/main.cpp
@@ -463,55 +463,10 @@ void Nudge_ShowPopup(CNudgeElement n, HANDLE hContact, TCHAR * Message)
 

 void Nudge_SentStatus(CNudgeElement n, HANDLE hContact)

 {

-	DBEVENTINFO NudgeEvent = { 0 };

-

-	NudgeEvent.cbSize = sizeof(NudgeEvent);

-	NudgeEvent.szModule = GetContactProto(hContact);

-

-	char *buff = mir_utf8encodeT(n.senText);

-	NudgeEvent.flags = DBEF_SENT | DBEF_UTF;

-

-	NudgeEvent.timestamp = ( DWORD )time(NULL);

-	NudgeEvent.eventType = EVENTTYPE_STATUSCHANGE;

-	NudgeEvent.cbBlob = (DWORD)strlen(buff) + 1;

-	NudgeEvent.pBlob = ( PBYTE ) buff;

-

-	INT_PTR res = CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0 ); //try to retrieve the metacontact if some

-	if(res != CALLSERVICE_NOTFOUND) {

-		HANDLE hMetaContact = (HANDLE) res;

-		if(hMetaContact != NULL) //metacontact

-			db_event_add(hMetaContact, &NudgeEvent);

-	}

-

-	db_event_add(hContact, &NudgeEvent);

 }

 

 void Nudge_ShowStatus(CNudgeElement n, HANDLE hContact, DWORD timestamp)

 {

-	DBEVENTINFO NudgeEvent = { 0 };

-

-	NudgeEvent.cbSize = sizeof(NudgeEvent);

-	NudgeEvent.szModule = GetContactProto(hContact);

-

-	char *buff = mir_utf8encodeT(n.recText);

-	NudgeEvent.flags = DBEF_UTF;

-

-	NudgeEvent.timestamp = timestamp;

-	NudgeEvent.eventType = EVENTTYPE_STATUSCHANGE;

-	NudgeEvent.cbBlob = (DWORD)strlen(buff) + 1;

-	NudgeEvent.pBlob = ( PBYTE ) buff;

-

-

-	INT_PTR res = CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0 ); //try to retrieve the metacontact if some

-	if(res != CALLSERVICE_NOTFOUND) {

-		HANDLE hMetaContact = (HANDLE) res;

-		if(hMetaContact != NULL) { //metacontact

-			db_event_add(hMetaContact, &NudgeEvent);

-			NudgeEvent.flags |= DBEF_READ;

-		}

-	}

-

-	db_event_add(hContact, &NudgeEvent);

 }

 

 HANDLE Nudge_GethContact(HANDLE hContact)

diff --git a/plugins/Nudge/src/nudge.h b/plugins/Nudge/src/nudge.h
index 8a6c39e5d5..0a8023104d 100644
--- a/plugins/Nudge/src/nudge.h
+++ b/plugins/Nudge/src/nudge.h
@@ -14,8 +14,6 @@
 #define NUDGE_ACC_ST9   0x00000200		//Check (countdown) when Out to lunch

 

 // For status log

-#define EVENTTYPE_STATUSCHANGE	25368

-

 #define TEXT_LEN 1024

 

 class CNudge

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

diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp
index f4c08d4208..56c471ef27 100644
--- a/plugins/wbOSD/src/events.cpp
+++ b/plugins/wbOSD/src/events.cpp
@@ -141,7 +141,7 @@ int HookedNewEvent(WPARAM wParam, LPARAM lParam)
 	if(db_event_get(hDBEvent,&dbe))

 		return 0;

 

-	if (dbe.flags & DBEF_SENT || dbe.eventType == 25368)

+	if (dbe.flags & DBEF_SENT)

 	    return 0;

 

 	if (db_get_b(NULL,THIS_MODULE, "messages", DEFAULT_ANNOUNCEMESSAGES)==0)

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index d43bb152e7..c17ecab0be 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1161,40 +1161,6 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 							SendMessage(hwndDlg, DM_UPDATEWINICON, 0, 0);

 					}

 

-					// log

-					if ((dat->wStatus != dat->wOldStatus || lParam != 0) &&

-						db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCH, SRMSGDEFSET_SHOWSTATUSCH)) {

-						TCHAR buffer[200];

-						int iLen;

-

-						TCHAR *szOldStatus = pcli->pfnGetStatusModeDescription(dat->wOldStatus, 0);

-						TCHAR *szNewStatus = pcli->pfnGetStatusModeDescription(dat->wStatus, 0);

-

-						if (dat->wStatus == ID_STATUS_OFFLINE) {

-							iLen = mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("signed off (was %s)"), szOldStatus);

-							SendMessage(hwndDlg, DM_TYPING, 0, 0);

-						}

-						else if (dat->wOldStatus == ID_STATUS_OFFLINE)

-							iLen = mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("signed on (%s)"), szNewStatus);

-						else

-							iLen = mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("is now %s (was %s)"), szNewStatus, szOldStatus);

-

-						char* blob = ( char* )alloca(1000);

-						int ansiLen = WideCharToMultiByte(CP_ACP, 0, buffer, -1, blob, 1000, 0, 0);

-						memcpy( blob+ansiLen, buffer, sizeof(TCHAR)*(iLen+1));

-

-						DBEVENTINFO dbei = { sizeof(dbei) };

-						dbei.cbBlob = ansiLen + sizeof(TCHAR)*(iLen+1);

-						dbei.pBlob = (PBYTE) blob;

-						dbei.eventType = EVENTTYPE_STATUSCHANGE;

-						dbei.timestamp = (DWORD)time(NULL);

-						dbei.szModule = dat->szProto;

-						HANDLE hNewEvent = db_event_add(dat->hContact, &dbei);

-						if (dat->hDbEventFirst == NULL) {

-							dat->hDbEventFirst = hNewEvent;

-							SendMessage(hwndDlg, DM_REMAKELOG, 0, 0);

-						}

-					}

 					dat->wOldStatus = dat->wStatus;

 				}

 			}

@@ -1386,7 +1352,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				else

 					SendMessage(hwndDlg, DM_REMAKELOG, 0, 0);

 

-				if ( !(dbei.flags & DBEF_SENT) && dbei.eventType != EVENTTYPE_STATUSCHANGE) {

+				if ( !(dbei.flags & DBEF_SENT)) {

 					if (GetActiveWindow() == hwndDlg && GetForegroundWindow() == hwndDlg) {

 						HWND hwndLog = GetDlgItem(hwndDlg, IDC_LOG);

 						if (GetWindowLongPtr(hwndLog, GWL_STYLE) & WS_VSCROLL) {

diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 53f1ef7582..c18fe893a9 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -256,7 +256,6 @@ int DbEventIsShown(DBEVENTINFO * dbei, SrmmWindowData *dat)
 			return 1;

 		case EVENTTYPE_JABBER_CHATSTATES:

 		case EVENTTYPE_JABBER_PRESENCE:

-		case EVENTTYPE_STATUSCHANGE:

 		case EVENTTYPE_FILE:

 			return (dbei->flags & DBEF_READ) == 0;

 	}

@@ -285,7 +284,7 @@ static char *CreateRTFFromDbEvent(SrmmWindowData *dat, HANDLE hContact, HANDLE h
 		db_event_markRead(hContact, hDbEvent);

 		CallService(MS_CLIST_REMOVEEVENT, (WPARAM) hContact, (LPARAM) hDbEvent);

 	}

-	else if (dbei.eventType == EVENTTYPE_STATUSCHANGE || dbei.eventType == EVENTTYPE_JABBER_CHATSTATES || dbei.eventType == EVENTTYPE_JABBER_PRESENCE) {

+	else if (dbei.eventType == EVENTTYPE_JABBER_CHATSTATES || dbei.eventType == EVENTTYPE_JABBER_PRESENCE) {

 		db_event_markRead(hContact, hDbEvent);

 	}

 	bufferEnd = 0;

@@ -324,7 +323,6 @@ static char *CreateRTFFromDbEvent(SrmmWindowData *dat, HANDLE hContact, HANDLE h
 

 		case EVENTTYPE_JABBER_CHATSTATES:

 		case EVENTTYPE_JABBER_PRESENCE:

-		case EVENTTYPE_STATUSCHANGE:

 		case EVENTTYPE_FILE:

 		default:

 			i = LOGICON_MSG_NOTICE;

@@ -354,7 +352,7 @@ static char *CreateRTFFromDbEvent(SrmmWindowData *dat, HANDLE hContact, HANDLE h
 		showColon = 1;

 	}

 

-	if (!(g_dat.flags&SMF_HIDENAMES) && dbei.eventType != EVENTTYPE_STATUSCHANGE && dbei.eventType != EVENTTYPE_JABBER_CHATSTATES && dbei.eventType != EVENTTYPE_JABBER_PRESENCE) {

+	if (!(g_dat.flags & SMF_HIDENAMES) && dbei.eventType != EVENTTYPE_JABBER_CHATSTATES && dbei.eventType != EVENTTYPE_JABBER_PRESENCE) {

 		TCHAR* szName;

 		CONTACTINFO ci = {0};

 

@@ -392,7 +390,6 @@ static char *CreateRTFFromDbEvent(SrmmWindowData *dat, HANDLE hContact, HANDLE h
 		}

 		case EVENTTYPE_JABBER_CHATSTATES:

 		case EVENTTYPE_JABBER_PRESENCE:

-		case EVENTTYPE_STATUSCHANGE:

 		{

 			TCHAR *msg, *szName;

 			CONTACTINFO ci = {0};

diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h
index d459efa56f..b3cfc3bf92 100644
--- a/src/core/stdmsg/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
@@ -88,7 +88,6 @@ struct SrmmWindowData
 

 #define EVENTTYPE_JABBER_CHATSTATES     2000

 #define EVENTTYPE_JABBER_PRESENCE       2001

-#define EVENTTYPE_STATUSCHANGE          25368

 

 struct CREOleCallback : public IRichEditOleCallback

 {

diff --git a/src/modules/database/dbutils.cpp b/src/modules/database/dbutils.cpp
index 83824c8315..81693aa23b 100644
--- a/src/modules/database/dbutils.cpp
+++ b/src/modules/database/dbutils.cpp
@@ -175,11 +175,6 @@ static INT_PTR DbEventGetText(WPARAM wParam, LPARAM lParam)
 		return 0;

 	}

 

-	// temporary fix for bug with event types conflict between jabber chat states notifications

-	// and srmm's status changes, must be commented out in future releases

-	if (dbei->eventType == 25368 && dbei->cbBlob == 1 && dbei->pBlob[0] == 1)

-		return 0;

-

 	// by default treat an event's blob as a string 

 	if (egt->datatype == DBVT_WCHAR) {

 		char *str = (char*)alloca(dbei->cbBlob + 1);