obsolete ICQ trash removed from headers

7 files changed, 5 insertions, 121 deletions

diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp
index 797e41b92d..82fe319919 100644
--- a/plugins/BasicHistory/src/Options.cpp
+++ b/plugins/BasicHistory/src/Options.cpp
@@ -36,8 +36,7 @@ EventNames[] =
 	EVENTTYPE_FILE, LPGENW("File transfer"),

 	EVENTTYPE_AUTHREQUEST, LPGENW("Authorization request"),

 	EVENTTYPE_ADDED, LPGENW("You were added"),

-	EVENTTYPE_CONTACTS, LPGENW("Contacts received"),

-	ICQEVENTTYPE_SMS, LPGENW("SMS message")

+	EVENTTYPE_CONTACTS, LPGENW("Contacts received")

 };

 

 struct TCpTable

diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas
index 4ade13228a..3415906d2e 100644
--- a/plugins/HistoryPlusPlus/hpp_events.pas
+++ b/plugins/HistoryPlusPlus/hpp_events.pas
@@ -118,8 +118,6 @@ procedure GetEventTextForAuthRequest(EventInfo: TDBEventInfo; var Hi: THistoryIt
 procedure GetEventTextForYouWereAdded(EventInfo: TDBEventInfo; var Hi: THistoryItem);

 procedure GetEventTextForSms(EventInfo: TDBEventInfo; var Hi: THistoryItem);

 procedure GetEventTextForContacts(EventInfo: TDBEventInfo; var Hi: THistoryItem);

-procedure GetEventTextForWebPager(EventInfo: TDBEventInfo; var Hi: THistoryItem);

-procedure GetEventTextForEmailExpress(EventInfo: TDBEventInfo; var Hi: THistoryItem);

 procedure GetEventTextForStatusChange(EventInfo: TDBEventInfo; var Hi: THistoryItem);

 procedure GetEventTextForAvatarChange(EventInfo: TDBEventInfo; var Hi: THistoryItem);

 procedure GetEventTextForICQAuthGranted(EventInfo: TDBEventInfo; var Hi: THistoryItem);

@@ -183,7 +181,7 @@ type
   end;

 

 var

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

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

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

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

     // events definitions

@@ -195,8 +193,6 @@ var
     (EventType: EVENTTYPE_STATUSCHANGE;          MessageType: mtStatus;        TextFunction: GetEventTextForStatusChange),

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

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

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

-    (EventType: ICQEVENTTYPE_EMAILEXPRESS;       MessageType: mtEmailExpress;  TextFunction: GetEventTextForEmailExpress),

     (EventType: EVENTTYPE_NICKNAMECHANGE;        MessageType: mtNickChange;    TextFunction: GetEventTextForMessage),

     (EventType: EVENTTYPE_STATUSMESSAGECHANGE;   MessageType: mtStatusMessage; TextFunction: GetEventTextForMessage),

     (EventType: EVENTTYPE_AVATARCHANGE;          MessageType: mtAvatarChange;  TextFunction: GetEventTextForAvatarChange),

diff --git a/plugins/HistoryStats/src/statistic.h b/plugins/HistoryStats/src/statistic.h
index b0de0b3392..9c387af846 100644
--- a/plugins/HistoryStats/src/statistic.h
+++ b/plugins/HistoryStats/src/statistic.h
@@ -37,9 +37,7 @@ public:
 		etMessage             = EVENTTYPE_MESSAGE,

 		// other events

 		etFile                = EVENTTYPE_FILE,

-		etICQSMS              = ICQEVENTTYPE_SMS,

-		etICQWebPager         = ICQEVENTTYPE_WEBPAGER,

-		etICQEMailExpress     = ICQEVENTTYPE_EMAILEXPRESS,

+

 		// authorization and contacts

 		etAuthRequest         = EVENTTYPE_AUTHREQUEST,

 		etAdded               = EVENTTYPE_ADDED,

diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp
index d79a2537de..d49f796cac 100755
--- a/plugins/Msg_Export/src/utils.cpp
+++ b/plugins/Msg_Export/src/utils.cpp
@@ -910,54 +910,6 @@ static bool ExportDBEventInfo(MCONTACT hContact, HANDLE hFile, wstring sFilePath
 			}

 			break;

 

-		case ICQEVENTTYPE_EMAILEXPRESS:

-		case ICQEVENTTYPE_WEBPAGER:

-			{

-				//e-mail express 

-				//db event added to NULL contact

-				//blob format is:

-				//ASCIIZ    text, usually of the form "Subject: %s\r\n%s"

-				//ASCIIZ    from name

-				//ASCIIZ    from e-mail

-

-				//www pager

-				//db event added to NULL contact

-				//blob format is:

-				//ASCIIZ    text, usually "Sender IP: xxx.xxx.xxx.xxx\r\n%s"

-				//ASCIIZ    from name

-				//ASCIIZ    from e-mail

-				const char* pszStr = (const char*)dbei.pBlob;

-

-				if (dbei.eventType == ICQEVENTTYPE_EMAILEXPRESS)

-					bWriteTextToFile(hFile, LPGENW("EmailExpress from:"), bWriteUTF8Format);

-				else

-					bWriteTextToFile(hFile, LPGENW("WebPager from:"), bWriteUTF8Format);

-

-				bWriteNewLine(hFile, nIndent);

-

-				size_t nMsgLenght = mir_strlen(pszStr) + 1;

-				if (nMsgLenght < dbei.cbBlob) {

-					size_t nFriendlyLen = mir_strlen(&pszStr[nMsgLenght]);

-					bWriteTextToFile(hFile, &pszStr[nMsgLenght], bWriteUTF8Format, (int)nFriendlyLen);

-					size_t nEmailOffset = nMsgLenght + nFriendlyLen + 1;

-					if (nEmailOffset < dbei.cbBlob) {

-						bWriteTextToFile(hFile, L"<", bWriteUTF8Format);

-						size_t nEmailLen = mir_strlen(&pszStr[nEmailOffset]);

-						bWriteTextToFile(hFile, &pszStr[nEmailOffset], bWriteUTF8Format, (int)nEmailLen);

-						bWriteTextToFile(hFile, L">", bWriteUTF8Format);

-					}

-				}

-				else bWriteTextToFile(hFile, LPGENW("No from address"), bWriteUTF8Format);

-

-				bWriteNewLine(hFile, nIndent);

-				bWriteIndentedToFile(hFile, nIndent, _A2T(pszStr), bWriteUTF8Format);

-			}

-			break;

-

-		case ICQEVENTTYPE_SMS:

-			bWriteIndentedToFile(hFile, nIndent, _A2T((const char*)dbei.pBlob), bWriteUTF8Format);

-			break;

-

 		default:

 			int n = mir_snwprintf(szTemp, TranslateT("Unknown event type %d, size %d"), dbei.eventType, dbei.cbBlob);

 			bWriteTextToFile(hFile, szTemp, bWriteUTF8Format, n);

diff --git a/plugins/NewEventNotify/src/popup.cpp b/plugins/NewEventNotify/src/popup.cpp
index 43ca3d2e27..24c697f4c3 100644
--- a/plugins/NewEventNotify/src/popup.cpp
+++ b/plugins/NewEventNotify/src/popup.cpp
@@ -201,10 +201,10 @@ static wchar_t* GetEventPreview(DBEVENTINFO *dbei)
 		commentFix = POPUP_COMMENT_FILE;

 		break;

 

+	case EVENTTYPE_CONTACTS:

 		// blob format is:

 		// ASCIIZ    nick

 		// ASCIIZ    UID

-	case EVENTTYPE_CONTACTS:

 		if (dbei->pBlob) {

 			// count contacts in event

 			char* pcBlob = (char *)dbei->pBlob;

@@ -227,6 +227,7 @@ static wchar_t* GetEventPreview(DBEVENTINFO *dbei)
 		commentFix = POPUP_COMMENT_CONTACTS;

 		break;

 

+	case EVENTTYPE_ADDED:

 		// blob format is:

 		// DWORD     numeric uin (ICQ only afaik)

 		// DWORD     HANDLE to contact

@@ -234,7 +235,6 @@ static wchar_t* GetEventPreview(DBEVENTINFO *dbei)
 		// ASCIIZ    first name

 		// ASCIIZ    last name

 		// ASCIIZ    email (or YID)

-	case EVENTTYPE_ADDED:

 		if (dbei->pBlob) {

 			char szUin[16];

 			wchar_t szBuf[2048];

@@ -290,58 +290,6 @@ static wchar_t* GetEventPreview(DBEVENTINFO *dbei)
 		commentFix = POPUP_COMMENT_AUTH;

 		break;

 

-		// blob format is:

-		// ASCIIZ    text, usually "Sender IP: xxx.xxx.xxx.xxx\r\n%s"

-		// ASCIIZ    from name

-		// ASCIIZ    from e-mail

-	case ICQEVENTTYPE_WEBPAGER:

-		if (dbei->pBlob) comment1 = mir_a2u((const char *)dbei->pBlob);

-		commentFix = POPUP_COMMENT_WEBPAGER;

-		break;

-

-		// blob format is:

-		// ASCIIZ    text, usually of the form "Subject: %s\r\n%s"

-		// ASCIIZ    from name

-		// ASCIIZ    from e-mail

-	case ICQEVENTTYPE_EMAILEXPRESS:

-		if (dbei->pBlob) comment1 = mir_a2u((const char *)dbei->pBlob);

-		commentFix = POPUP_COMMENT_EMAILEXP;

-		break;

-

-		// blob format is:

-		// ASCIIZ    text, usually of the form "SMS From: +XXXXXXXX\r\nTEXT"

-	case ICQEVENTTYPE_SMS:

-		if (dbei->pBlob) {

-			if (dbei->flags & DBEF_UTF) {

-				// utf-8 in blob

-				comment1 = mir_utf8decodeW((char*)dbei->pBlob);

-			}

-			else if (dbei->cbBlob == (mir_wstrlen((wchar_t *)dbei->pBlob) + 1)*(sizeof(wchar_t) + 1)) {

-				// wchar in blob (the old hack)

-				comment1 = mir_wstrdup((wchar_t*)dbei->pBlob);

-			}

-			else comment1 = mir_a2u((char *)dbei->pBlob);

-		}

-		commentFix = POPUP_COMMENT_SMS;

-		break;

-

-		// blob format is:

-		// ASCIIZ text, usually of the form "SMS Confirmation From: +XXXXXXXXXXXX\r\nSMS was sent succesfully"

-	case ICQEVENTTYPE_SMSCONFIRMATION:

-		if (dbei->pBlob) {

-			if (dbei->flags & DBEF_UTF) {

-				// utf-8 in blob

-				comment1 = mir_utf8decodeW((char*)dbei->pBlob);

-			}

-			else if (dbei->cbBlob == (mir_wstrlen((wchar_t *)dbei->pBlob) + 1)*(sizeof(wchar_t) + 1)) {

-				// wchar in blob (the old hack)

-				comment1 = mir_wstrdup((wchar_t*)dbei->pBlob);

-			}

-			else comment1 = mir_a2u((char *)dbei->pBlob);

-		}

-		commentFix = POPUP_COMMENT_SMSCONFIRMATION;

-		break;

-

 	default:

 		DBEVENTTYPEDESCR *pei = DbEvent_GetType(dbei->szModule, dbei->eventType);

 		// support for custom database event types

diff --git a/plugins/NewEventNotify/src/stdafx.h b/plugins/NewEventNotify/src/stdafx.h
index 74b02b059e..beb2e3555d 100644
--- a/plugins/NewEventNotify/src/stdafx.h
+++ b/plugins/NewEventNotify/src/stdafx.h
@@ -127,12 +127,6 @@
 #define POPUP_COMMENT_CONTACTS LPGEN("Contacts")

 #define POPUP_COMMENT_ADDED LPGEN("You were added!")

 #define POPUP_COMMENT_AUTH LPGEN("Requests your authorization")

-#define POPUP_COMMENT_WEBPAGER LPGEN("ICQ Web pager")

-#define POPUP_COMMENT_EMAILEXP LPGEN("ICQ Email express")

-

-#define ICQEVENTTYPE_SMSCONFIRMATION 3001

-#define POPUP_COMMENT_SMS LPGEN("SMS Message")

-#define POPUP_COMMENT_SMSCONFIRMATION LPGEN("SMS Confirmation")

 

 #define POPUP_COMMENT_OTHER LPGEN("Unknown Event")

 

diff --git a/plugins/TipperYM/src/message_pump.cpp b/plugins/TipperYM/src/message_pump.cpp
index dab7a37265..220b974f7f 100644
--- a/plugins/TipperYM/src/message_pump.cpp
+++ b/plugins/TipperYM/src/message_pump.cpp
@@ -312,9 +312,6 @@ int ProtoAck(WPARAM, LPARAM lParam)
 		if (mir_wstrlen(tszMsg))

 			PostMPMessage(MUM_GOTSTATUS, (WPARAM)ack->hContact, (LPARAM)mir_wstrdup(tszMsg));

 	}

-	else if (ack->type == ICQACKTYPE_XSTATUS_RESPONSE)

-		PostMPMessage(MUM_GOTXSTATUS, (WPARAM)ack->hContact, 0);

-

 	return 0;

 }