From 7b4d32e5cf9a8bc8ab398e4041cb99e8fb57ada0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 31 Jan 2019 16:31:23 +0300 Subject: fixes #1807 (Remove obsolete ICQ shit) --- .../historypp_icons/res/Icon_39.ico | Bin 1150 -> 0 bytes .../historypp_icons/res/Icon_40.ico | Bin 1150 -> 0 bytes .../historypp_icons/res/Icon_41.ico | Bin 1150 -> 0 bytes .../historypp_icons/res/resource.rc | 3 - plugins/HistoryPlusPlus/hpp_events.pas | 125 +-------------------- plugins/HistoryPlusPlus/hpp_global.pas | 5 +- plugins/HistoryPlusPlus/hpp_options.pas | 8 +- plugins/StopSpamMod/src/stopspam.cpp | 1 - 8 files changed, 6 insertions(+), 136 deletions(-) delete mode 100644 plugins/HistoryPlusPlus/historypp_icons/res/Icon_39.ico delete mode 100644 plugins/HistoryPlusPlus/historypp_icons/res/Icon_40.ico delete mode 100644 plugins/HistoryPlusPlus/historypp_icons/res/Icon_41.ico (limited to 'plugins') diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_39.ico b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_39.ico deleted file mode 100644 index f41176f07c..0000000000 Binary files a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_39.ico and /dev/null differ diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_40.ico b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_40.ico deleted file mode 100644 index 1ad19ff5eb..0000000000 Binary files a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_40.ico and /dev/null differ diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_41.ico b/plugins/HistoryPlusPlus/historypp_icons/res/Icon_41.ico deleted file mode 100644 index 7a5e461f6f..0000000000 Binary files a/plugins/HistoryPlusPlus/historypp_icons/res/Icon_41.ico and /dev/null differ diff --git a/plugins/HistoryPlusPlus/historypp_icons/res/resource.rc b/plugins/HistoryPlusPlus/historypp_icons/res/resource.rc index 4885c06783..e2472e1406 100644 --- a/plugins/HistoryPlusPlus/historypp_icons/res/resource.rc +++ b/plugins/HistoryPlusPlus/historypp_icons/res/resource.rc @@ -65,9 +65,6 @@ IDI_ICON35 ICON "Icon_35.ico" IDI_ICON36 ICON "Icon_36.ico" IDI_ICON37 ICON "Icon_37.ico" IDI_ICON38 ICON "Icon_38.ico" -IDI_ICON39 ICON "Icon_39.ico" -IDI_ICON40 ICON "Icon_40.ico" -IDI_ICON41 ICON "Icon_41.ico" IDI_ICON42 ICON "Icon_42.ico" IDI_ICON43 ICON "Icon_43.ico" IDI_ICON44 ICON "Icon_44.ico" diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas index 36603472a6..34cee15e03 100644 --- a/plugins/HistoryPlusPlus/hpp_events.pas +++ b/plugins/HistoryPlusPlus/hpp_events.pas @@ -118,14 +118,6 @@ procedure GetEventTextForSms(EventInfo: TDBEventInfo; var Hi: THistoryItem); procedure GetEventTextForContacts(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); -procedure GetEventTextForICQAuthDenied(EventInfo: TDBEventInfo; var Hi: THistoryItem); -procedure GetEventTextForICQSelfRemove(EventInfo: TDBEventInfo; var Hi: THistoryItem); -procedure GetEventTextForICQFutureAuth(EventInfo: TDBEventInfo; var Hi: THistoryItem); -procedure GetEventTextForICQClientChange(EventInfo: TDBEventInfo; var Hi: THistoryItem); -procedure GetEventTextForICQCheckStatus(EventInfo: TDBEventInfo; var Hi: THistoryItem); -procedure GetEventTextForICQIgnoreCheckStatus(EventInfo: TDBEventInfo; var Hi: THistoryItem); -procedure GetEventTextForICQBroadcast(EventInfo: TDBEventInfo; var Hi: THistoryItem); procedure GetEventTextForJabberChatStates(EventInfo: TDBEventInfo; var Hi: THistoryItem); procedure GetEventTextWATrackRequest(EventInfo: TDBEventInfo; var Hi: THistoryItem); procedure GetEventTextWATrackAnswer(EventInfo: TDBEventInfo; var Hi: THistoryItem); @@ -144,26 +136,6 @@ const // registered Jabber db event types (not public) // JS_DB_GETEVENTTEXT_CHATSTATES = '/GetEventText2000'; JABBER_DB_EVENT_CHATSTATES_GONE = 1; -const // ICQ db events (didn't found anywhere) - //auth - //db event added to NULL contact - //blob format is: - //ASCIIZ text - //DWORD uin - //HANDLE hContact - ICQEVENTTYPE_AUTH_GRANTED = 2004; //database event type - ICQEVENTTYPE_AUTH_DENIED = 2005; //database event type - ICQEVENTTYPE_SELF_REMOVE = 2007; //database event type - ICQEVENTTYPE_FUTURE_AUTH = 2008; //database event type - ICQEVENTTYPE_CLIENT_CHANGE = 2009; //database event type - ICQEVENTTYPE_CHECK_STATUS = 2010; //database event type - ICQEVENTTYPE_IGNORECHECK_STATUS = 2011;//database event type - //broadcast from server - //ASCIIZ text - //ASCIIZ from name - //ASCIIZ from e-mail - ICQEVENTTYPE_BROADCAST = 2006; //database event type - type TModuleEventRecord = record EventDesc: PDBEVENTTYPEDESCR; @@ -179,7 +151,7 @@ type end; var - EventTable: array[0..24] of TEventTableItem = ( + EventTable: array[0..16] of TEventTableItem = ( // must be the first item in array for unknown events (EventType: MaxWord; MessageType: mtOther; TextFunction: GetEventTextForOther), // events definitions @@ -193,14 +165,6 @@ var (EventType: EVENTTYPE_NICKNAMECHANGE; MessageType: mtNickChange; TextFunction: GetEventTextForMessage), (EventType: EVENTTYPE_STATUSMESSAGECHANGE; MessageType: mtStatusMessage; TextFunction: GetEventTextForMessage), (EventType: EVENTTYPE_AVATARCHANGE; MessageType: mtAvatarChange; TextFunction: GetEventTextForAvatarChange), - (EventType: ICQEVENTTYPE_AUTH_GRANTED; MessageType: mtSystem; TextFunction: GetEventTextForICQAuthGranted), - (EventType: ICQEVENTTYPE_AUTH_DENIED; MessageType: mtSystem; TextFunction: GetEventTextForICQAuthDenied), - (EventType: ICQEVENTTYPE_SELF_REMOVE; MessageType: mtSystem; TextFunction: GetEventTextForICQSelfRemove), - (EventType: ICQEVENTTYPE_FUTURE_AUTH; MessageType: mtSystem; TextFunction: GetEventTextForICQFutureAuth), - (EventType: ICQEVENTTYPE_CLIENT_CHANGE; MessageType: mtSystem; TextFunction: GetEventTextForICQClientChange), - (EventType: ICQEVENTTYPE_CHECK_STATUS; MessageType: mtSystem; TextFunction: GetEventTextForICQCheckStatus), - (EventType: ICQEVENTTYPE_IGNORECHECK_STATUS; MessageType: mtSystem; TextFunction: GetEventTextForICQIgnoreCheckStatus), - (EventType: ICQEVENTTYPE_BROADCAST; MessageType: mtSystem; TextFunction: GetEventTextForICQBroadcast), (EventType: JABBER_DB_EVENT_TYPE_CHATSTATES; MessageType: mtStatus; TextFunction: GetEventTextForJabberChatStates), (EventType: EVENTTYPE_CONTACTLEFTCHANNEL; MessageType: mtStatus; TextFunction: GetEventTextForMessage), (EventType: EVENTTYPE_WAT_REQUEST; MessageType: mtWATrack; TextFunction: GetEventTextWATrackRequest), @@ -714,93 +678,6 @@ begin end; end; -function GetEventTextForICQSystem(EventInfo: TDBEventInfo; const Template: String): String; -var - BytePos: LongWord; - Body: AnsiString; - uin: Integer; - Name: WideString; - cp: Cardinal; -begin - BytePos := 0; - ReadStringTillZeroA(Pointer(EventInfo.pBlob), EventInfo.cbBlob, Body, BytePos); - if Cardinal(EventInfo.cbBlob) < (BytePos + 4) then - uin := 0 - else - uin := PDWord(PAnsiChar(EventInfo.pBlob) + BytePos)^; - if Cardinal(EventInfo.cbBlob) < (BytePos + 8) then - Name := TranslateW('''(Unknown Contact)''' { TRANSLATE-IGNORE } ) - else - Name := GetContactDisplayName(PDWord(PAnsiChar(EventInfo.pBlob) + BytePos + 4)^, '', true); - if Boolean(EventInfo.flags and DBEF_UTF) then - cp := CP_UTF8 - else - cp := hppCodepage; - Result := Format(Template, [Name, uin, AnsiToWideString(#13#10 + Body, cp)]); -end; - -procedure GetEventTextForICQAuthGranted(EventInfo: TDBEventInfo; var Hi: THistoryItem); -begin - hi.Text := GetEventTextForICQSystem(EventInfo, - TranslateW('Authorization request granted by %s (%d): %s')); -end; - -procedure GetEventTextForICQAuthDenied(EventInfo: TDBEventInfo; var Hi: THistoryItem); -begin - hi.Text := GetEventTextForICQSystem(EventInfo, - TranslateW('Authorization request denied by %s (%d): %s')); -end; - -procedure GetEventTextForICQSelfRemove(EventInfo: TDBEventInfo; var Hi: THistoryItem); -begin - hi.Text := GetEventTextForICQSystem(EventInfo, - TranslateW('User %s (%d) removed himself from your contact list: %s')); -end; - -procedure GetEventTextForICQFutureAuth(EventInfo: TDBEventInfo; var Hi: THistoryItem); -begin - hi.Text := GetEventTextForICQSystem(EventInfo, - TranslateW('Authorization future request by %s (%d): %s')); -end; - -procedure GetEventTextForICQClientChange(EventInfo: TDBEventInfo; var Hi: THistoryItem); -begin - hi.Text := GetEventTextForICQSystem(EventInfo, - TranslateW('User %s (%d) changed ICQ client: %s')); -end; - -procedure GetEventTextForICQCheckStatus(EventInfo: TDBEventInfo; var Hi: THistoryItem); -begin - hi.Text := GetEventTextForICQSystem(EventInfo, - TranslateW('Status request by %s (%d):%s')); -end; - -procedure GetEventTextForICQIgnoreCheckStatus(EventInfo: TDBEventInfo; var Hi: THistoryItem); -begin - hi.Text := GetEventTextForICQSystem(EventInfo, - TranslateW('Ignored status request by %s (%d):%s')); -end; - -procedure GetEventTextForICQBroadcast(EventInfo: TDBEventInfo; var Hi: THistoryItem); -var - BytePos: LongWord; - Body,Name,Email: AnsiString; - cp: Cardinal; -begin - BytePos := 0; - ReadStringTillZeroA(Pointer(EventInfo.pBlob),EventInfo.cbBlob,Body,BytePos); - ReadStringTillZeroA(Pointer(EventInfo.pBlob),EventInfo.cbBlob,Name,BytePos); - ReadStringTillZeroA(Pointer(EventInfo.pBlob),EventInfo.cbBlob,Email,BytePos); - hi.Text := TranslateW('Broadcast message from %s (%s): %s'); - if Boolean(EventInfo.flags and DBEF_UTF) then - cp := CP_UTF8 - else - cp := hppCodepage; - hi.Text := Format(hi.Text,[AnsiToWideString(Name,cp), - AnsiToWideString(Email,cp), - AnsiToWideString(#13#10+Body,cp)]); -end; - procedure GetEventTextForJabberChatStates(EventInfo: TDBEventInfo; var Hi: THistoryItem); begin if EventInfo.cbBlob = 0 then exit; diff --git a/plugins/HistoryPlusPlus/hpp_global.pas b/plugins/HistoryPlusPlus/hpp_global.pas index ca49d88e61..925aa4c6d7 100644 --- a/plugins/HistoryPlusPlus/hpp_global.pas +++ b/plugins/HistoryPlusPlus/hpp_global.pas @@ -64,7 +64,7 @@ type TMessageType = (mtUnknown, mtIncoming, mtOutgoing, mtMessage, mtFile, mtSystem, - mtContacts, mtSMS, mtStatus, mtSMTPSimple, + mtContacts, mtStatus, mtSMTPSimple, mtOther, mtNickChange,mtAvatarChange,mtWATrack,mtStatusMessage,mtVoiceCall,mtCustom); @@ -233,9 +233,6 @@ const HPP_ICON_EVENT_OUTGOING = 34; HPP_ICON_EVENT_SYSTEM = 35; HPP_ICON_EVENT_CONTACTS = 36; - HPP_ICON_EVENT_SMS = 37; - HPP_ICON_EVENT_WEBPAGER = 38; - HPP_ICON_EVENT_EEXPRESS = 39; HPP_ICON_EVENT_STATUS = 40; HPP_ICON_EVENT_SMTPSIMPLE = 41; HPP_ICON_EVENT_NICK = 42; diff --git a/plugins/HistoryPlusPlus/hpp_options.pas b/plugins/HistoryPlusPlus/hpp_options.pas index 175ed3972f..a994f97c5e 100644 --- a/plugins/HistoryPlusPlus/hpp_options.pas +++ b/plugins/HistoryPlusPlus/hpp_options.pas @@ -156,17 +156,17 @@ const (_type: [hppFont,hppColor]; name: 'Outgoing file'; Mes: [mtFile,mtOutgoing]; style:0; size: -11; color: $000000; back: $9BEEE3), - (_type: [hppFont,hppColor]; name: 'Incoming url'; + (_type: [hppFont,hppColor]; name: 'Unused'; Mes: [mtIncoming]; style:0; size: -11; color: $000000; back: $F4D9CC), - (_type: [hppFont,hppColor]; name: 'Outgoing url'; + (_type: [hppFont,hppColor]; name: 'Unused'; Mes: [mtOutgoing]; style:0; size: -11; color: $000000; back: $F4D9CC), (_type: [hppFont,hppColor]; name: 'Unused'; - Mes: [mtSMS,mtIncoming]; style:0; size: -11; color: $000000; back: $CFF4FE), + Mes: [mtIncoming]; style:0; size: -11; color: $000000; back: $CFF4FE), (_type: [hppFont,hppColor]; name: 'Unused'; - Mes: [mtSMS,mtOutgoing]; style:0; size: -11; color: $000000; back: $CFF4FE), + Mes: [mtOutgoing]; style:0; size: -11; color: $000000; back: $CFF4FE), (_type: [hppFont,hppColor]; name: 'Incoming contacts'; Mes: [mtContacts,mtIncoming]; style:0; size: -11; color: $000000; back: $FEF4CF), diff --git a/plugins/StopSpamMod/src/stopspam.cpp b/plugins/StopSpamMod/src/stopspam.cpp index e3d77f1cc4..c9b460211c 100755 --- a/plugins/StopSpamMod/src/stopspam.cpp +++ b/plugins/StopSpamMod/src/stopspam.cpp @@ -184,7 +184,6 @@ int OnDbEventFilterAdd(WPARAM hContact, LPARAM l) // add contact to server list and local group if (gbAutoAddToServerList) { db_set_ws(hContact, "CList", "Group", gbAutoAuthGroup.c_str()); - CallProtoService(dbei->szModule, "/AddServerContact", hContact, 0); db_unset(hContact, "CList", "NotOnList"); } -- cgit v1.2.3