diff options
| -rw-r--r-- | include/delphi/m_api.pas | 1 | ||||
| -rw-r--r-- | include/delphi/m_icq.inc | 230 | ||||
| -rw-r--r-- | include/m_icq.h | 101 | ||||
| -rw-r--r-- | plugins/BasicHistory/src/Options.cpp | 3 | ||||
| -rw-r--r-- | plugins/HistoryPlusPlus/hpp_events.pas | 6 | ||||
| -rw-r--r-- | plugins/HistoryStats/src/statistic.h | 4 | ||||
| -rwxr-xr-x | plugins/Msg_Export/src/utils.cpp | 48 | ||||
| -rw-r--r-- | plugins/NewEventNotify/src/popup.cpp | 56 | ||||
| -rw-r--r-- | plugins/NewEventNotify/src/stdafx.h | 6 | ||||
| -rw-r--r-- | plugins/TipperYM/src/message_pump.cpp | 3 |
10 files changed, 17 insertions, 441 deletions
diff --git a/include/delphi/m_api.pas b/include/delphi/m_api.pas index 7d5032e1b8..a31a0525d4 100644 --- a/include/delphi/m_api.pas +++ b/include/delphi/m_api.pas @@ -220,7 +220,6 @@ var {$include m_hotkeys.inc}
{$include m_icolib.inc}
{$include m_iconheader.inc}
- {$include m_icq.inc}
{$include m_ignore.inc}
{$include m_imgsrvc.inc}
{$include m_json.inc}
diff --git a/include/delphi/m_icq.inc b/include/delphi/m_icq.inc deleted file mode 100644 index e0098424b5..0000000000 --- a/include/delphi/m_icq.inc +++ /dev/null @@ -1,230 +0,0 @@ -{ ---------------------------------------------------------------------------
- ICQ plugin for Miranda Instant Messenger
- ________________________________________
-
- Copyright c 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
- Copyright c 2001-2002 Jon Keating, Richard Hughes
- Copyright c 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
- Copyright c 2004-2009 Joe Kucera
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- -----------------------------------------------------------------------------
-
-// File name : $URL: https://svn.sourceforge.net/svnroot/miranda/trunk/miranda/include/m_icq.h $
-// Revision : $Revision: 9376 $
-// Last change on : $Date: 2009-04-09 23:55:33 +0400 (', 09 ๘๕? 2009) $
-// Last change by : $Author: jokusoftware $
-
- DESCRIPTION:
-
- Describe me here please...
-
- -----------------------------------------------------------------------------
- Note: In v0.3 the part before "/Servicename" is dynamic. It will be the name of the protocol.
- Example: If the plugin was loaded from ICQ.dll, the service name is "ICQ/Servicename", and if
- the dll was Icq2.dll, the service name will be "Icq2/Servicename". This behaviour is temporary
- until proper multiaccounts are implemented.
-}
-
-{$IFNDEF M_ICQ}
-{$DEFINE M_ICQ}
-// extended search result structure, used for all searches
-type
- PICQSEARCHRESULT = ^TICQSEARCHRESULT;
- TICQSEARCHRESULT = record
- hdr : TPROTOSEARCHRESULT;
- uin : dword;
- auth: byte;
- gender :byte;
- age :byte;
- country :dword;
- maritalStatus:byte;
- end;
-{
- Request authorization
- wParam=(WPARAM)hContact
-}
-const
- MS_REQ_AUTH = '/ReqAuth';
-{
- Grant authorization
- wParam=(WPARAM)hContact;
-}
- MS_GRANT_AUTH = '/GrantAuth';
-{
- Revoke authorization
- wParam=(WPARAM)hContact
-}
- MS_REVOKE_AUTH = '/RevokeAuth';
-
-{
- Open ICQ profile
- wParam=(WPARAM)hContact
-}
- MS_OPEN_PROFILE = '/OpenProfile';
-
-{
- Add contact to server-list
- wParam=(WPARAM)hContact
-}
- MS_ICQ_ADDSERVCONTACT = '/AddServerContact';
-{
- Display XStatus detail (internal use only)
- wParam=(WPARAM)hContact;
-}
- MS_XSTATUS_SHOWDETAILS = '/ShowXStatusDetails';
-
-{Send an SMS via the ICQ network
-wParam=(WPARAM)(const AnsiChar*)szPhoneNumber
-lParam=(LPARAM)(const AnsiChar*)szMessage
-Returns a HANDLE to the send on success, or NULL on failure
-szPhoneNumber should be the full number with international code and preceeded
- by a +
-
-When the server acks the send, an ack will be broadcast:
- type=ICQACKTYPE_SMS, result=ACKRESULT_SENTREQUEST, lParam=(LPARAM)(AnsiChar*)szInfo
-At this point the message is queued to be delivered. szInfo contains the raw
-XML data of the ack. Here's what I got when I tried:
-"<sms_response><source>airbornww.com</source><deliverable>Yes</deliverable><network>BT Cellnet, United Kingdom</network><message_id>[my uin]-1-1955988055-[destination phone#, without +]</message_id><messages_left>0</messages_left></sms_response>\r\n"
-Now the hProcess has been deleted. The only way to track which receipt
-corresponds with which response is to parse the <message_id> field.
-At a (possibly much) later time the SMS will have been delivered. An ack will
-be broadcast:
- type=ICQACKTYPE_SMS, result=ACKRESULT_SUCCESS, hProcess=NULL, lParam=(LPARAM)(AnsiChar*)szInfo
-Note that the result will always be success even if the send failed, just to
-save needing to have an attempt at an XML parser in the ICQ module.
-Here's the szInfo for a success:
-"<sms_delivery_receipt><message_id>[my uin]-1--1461632229-[dest phone#, without +]</message_id><destination>[dest phone#, without +]</destination><delivered>Yes</delivered><text>[first 20 bytes of message]</text><submition_time>Tue, 30 Oct 2001 22:35:16 GMT</submition_time><delivery_time>Tue, 30 Oct 2001 22:34:00 GMT</delivery_time></sms_delivery_receipt>"
-And here's a failure:
-"<sms_delivery_receipt><message_id>[my uin]-1-1955988055-[destination phone#, without leading +]</message_id><destination>[destination phone#, without leading +]</destination><delivered>No</delivered><submition_time>Tue, 23 Oct 2001 23:17:02 GMT</submition_time><error_code>999999</error_code><error><id>15</id><params><param>0</param><param>Multiple message submittion failed</param></params></error></sms_delivery_receipt>"
-SMSes received from phones come through this same ack, again to avoid having
-an XML parser in the protocol module. Here's one I got:
-"<sms_message><source>MTN</source><destination_UIN>[UIN of recipient, ie this account]</destination_UIN><sender>[sending phone number, without +]</sender><senders_network>[contains one space, because I sent from ICQ]</senders_network><text>[body of the message]</text><time>Fri, 16 Nov 2001 03:12:33 GMT</time></sms_message>"
-}
-
-{
- 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
-}
- ICQEVENTTYPE_EMAILEXPRESS = 2002; // database event type
-{
- 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
-}
- ICQEVENTTYPE_WEBPAGER = 2003; // database event type
-{
- missed message notification
- db event added to contact's history
- blob format is:
- word error code
-}
- ICQEVENTTYPE_MISSEDMESSAGE = 2004; //database event type
-{
- for server-side lists, used internally only
- hProcess=dwSequence
- lParam=server's error code, 0 for success
-}
- ICQACKTYPE_SERVERCLIST = 1003;
-{
- for rate warning distribution (mainly upload dlg)
- hProcess=Rate class ID
- lParam=server's status code
-}
- ICQACKTYPE_RATEWARNING = 1004;
-{
- received Xtraz Notify response
- hProcess=dwSequence
- lParam=contents of RES node
-}
- ICQACKTYPE_XTRAZNOTIFY_RESPONSE = 1005;
-{
- received Custom Status details response
- hProcess=dwSequence
- lParam=0
-}
- ICQACKTYPE_XSTATUS_RESPONSE = 1006;
-
-//Update user details on server
-//Permited operation types:
- CIXT_BASIC = $0001;
- CIXT_MORE = $0002;
- CIXT_WORK = $0004;
- CIXT_CONTACT = $0008;
- CIXT_LOCATION = $0010;
- CIXT_BACKGROUND = $0020;
- CIXT_EDUCATION = $0040;
- CIXT_EXTRA = $0080;
- CIXT_FULL = $00FF;
-
-//wParam=operationType
- PS_CHANGEINFOEX = '/ChangeInfoEx';
-
-{
- miranda/icqoscar/statusmsgreq event
- called when our status message is requested
- wParam=(byte)msgType
- lParam=(dword)uin
- msgType is one of the ICQ_MSGTYPE_GET###MSG constants in icq_constants.h
- uin is the UIN of the contact requesting our status message
-}
- ME_ICQ_STATUSMSGREQ = '/StatusMsgReq';
-
-{
- Request Custom status details (messages) for specified contact
- wParam = hContact // request custom status details for this contact
- lParam = 0
- return = (int)dwSequence // if successful it is sequence for ICQACKTYPE_XSTATUS_RESPONSE
- 0 failed to request (e.g. auto-request enabled)
- -1 delayed (rate control) - sequence unknown
-}
- PS_ICQ_REQUESTCUSTOMSTATUS = '/RequestXStatusDetails';
-
-const
- MAX_CAPNAME = 64;
-
-type
- TICQ_CUSTOMCAP = record
- cbSize: int;
- caps : array [0..15] of AnsiChar;
- hIcon : THANDLE;
- name : array [0..MAX_CAPNAME-1] of AnsiChar;
- end;
-
-const
-{
- Add a custom icq capability.
- wParam = 0;
- lParam = (LPARAM)(ICQ_CUSTOMCAP *)&icqCustomCap;
-}
- PS_ICQ_ADDCAPABILITY = '/IcqAddCapability';
-
-{
- Check if capability is supportes. Only icqCustomCap.caps does matter.
- wParam = (WPARAM)(HANDLE)hContact;
- lParam = (LPARAM)(ICQ_CUSTOMCAP *)&icqCustomCap;
- returns non-zero if capability is supported
-}
- PS_ICQ_CHECKCAPABILITY = '/IcqCheckCapability';
-
-{$ENDIF}
diff --git a/include/m_icq.h b/include/m_icq.h index c3a42007d6..0311a93e5a 100644 --- a/include/m_icq.h +++ b/include/m_icq.h @@ -58,85 +58,8 @@ typedef struct { // wParam = (WPARAM)hContact;
#define MS_XSTATUS_SHOWDETAILS "/ShowXStatusDetails"
-//Send an SMS via the ICQ network
-//wParam = (WPARAM)(const char*)szPhoneNumber
-//lParam = (LPARAM)(const char*)szMessage
-//Returns a HANDLE to the send on success, or NULL on failure
-//szPhoneNumber should be the full number with international code and preceeded
-//by a +
-
-//When the server acks the send, an ack will be broadcast:
-// type = ICQACKTYPE_SMS, result = ACKRESULT_SENTREQUEST, lParam = (LPARAM)(char*)szInfo
-//At this point the message is queued to be delivered. szInfo contains the raw
-//XML data of the ack. Here's what I got when I tried:
-//"<sms_response><source>airbornww.com</source><deliverable>Yes</deliverable><network>BT Cellnet, United Kingdom</network><message_id>[my uin]-1-1955988055-[destination phone#, without +]</message_id><messages_left>0</messages_left></sms_response>\r\n"
-
-//Now the hProcess has been deleted. The only way to track which receipt
-//corresponds with which response is to parse the <message_id> field.
-
-//At a (possibly much) later time the SMS will have been delivered. An ack will
-//be broadcast:
-// type = ICQACKTYPE_SMS, result = ACKRESULT_SUCCESS, hProcess = NULL, lParam = (LPARAM)(char*)szInfo
-//Note that the result will always be success even if the send failed, just to
-//save needing to have an attempt at an XML parser in the ICQ module.
-//Here's the szInfo for a success:
-//"<sms_delivery_receipt><message_id>[my uin]-1--1461632229-[dest phone#, without +]</message_id><destination>[dest phone#, without +]</destination><delivered>Yes</delivered><text>[first 20 bytes of message]</text><submition_time>Tue, 30 Oct 2001 22:35:16 GMT</submition_time><delivery_time>Tue, 30 Oct 2001 22:34:00 GMT</delivery_time></sms_delivery_receipt>"
-//And here's a failure:
-//"<sms_delivery_receipt><message_id>[my uin]-1-1955988055-[destination phone#, without leading +]</message_id><destination>[destination phone#, without leading +]</destination><delivered>No</delivered><submition_time>Tue, 23 Oct 2001 23:17:02 GMT</submition_time><error_code>999999</error_code><error><id>15</id><params><param>0</param><param>Multiple message submittion failed</param></params></error></sms_delivery_receipt>"
-
-//SMSes received from phones come through this same ack, again to avoid having
-//an XML parser in the protocol module. Here's one I got:
-//"<sms_message><source>MTN</source><destination_UIN>[UIN of recipient, ie this account]</destination_UIN><sender>[sending phone number, without +]</sender><senders_network>[contains one space, because I sent from ICQ]</senders_network><text>[body of the message]</text><time>Fri, 16 Nov 2001 03:12:33 GMT</time></sms_message>"
-#define ICQACKTYPE_SMS 1001
-#define ICQEVENTTYPE_SMS 2001 //database event type
-#define MS_ICQ_SENDSMS "/SendSMS"
-
-//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
-#define ICQEVENTTYPE_EMAILEXPRESS 2002 //database event type
-
-//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
-#define ICQEVENTTYPE_WEBPAGER 2003 //database event type
-
-//missed message notification
-//db event added to contact's history
-//blob format is:
-//WORD error code
-#define ICQEVENTTYPE_MISSEDMESSAGE 2004 //database event type
-
-
-//for server-side lists, used internally only
-//hProcess = dwSequence
-//lParam = server's error code, 0 for success
-#define ICQACKTYPE_SERVERCLIST 1003
-
-//for rate warning distribution (mainly upload dlg)
-//hProcess = Rate class ID
-//lParam = server's status code
-#define ICQACKTYPE_RATEWARNING 1004
-
-//received Xtraz Notify response
-//hProcess = dwSequence
-//lParam = contents of RES node
-#define ICQACKTYPE_XTRAZNOTIFY_RESPONSE 1005
-
-//received Custom Status details response
-//hProcess = dwSequence
-//lParam = 0
-#define ICQACKTYPE_XSTATUS_RESPONSE 1006
-
-
-//Update user details on server
-//Permited operation types:
+// Update user details on server
+// Permited operation types:
#define CIXT_BASIC 0x0001
#define CIXT_MORE 0x0002
#define CIXT_WORK 0x0004
@@ -147,21 +70,21 @@ typedef struct { #define CIXT_EXTRA 0x0080
#define CIXT_FULL 0x00FF
-//wParam = operationType
+// wParam = operationType
#define PS_CHANGEINFOEX "/ChangeInfoEx"
-//miranda/icqoscar/statusmsgreq event
-//called when our status message is requested
-//wParam = (BYTE)msgType
-//lParam = (DWORD)uin
-//msgType is one of the ICQ_MSGTYPE_GET###MSG constants in icq_constants.h
-//uin is the UIN of the contact requesting our status message
+// miranda/icqoscar/statusmsgreq event
+// called when our status message is requested
+// wParam = (BYTE)msgType
+// lParam = (DWORD)uin
+// msgType is one of the ICQ_MSGTYPE_GET###MSG constants in icq_constants.h
+// uin is the UIN of the contact requesting our status message
#define ME_ICQ_STATUSMSGREQ "/StatusMsgReq"
// Request Custom status details (messages) for specified contact
-//wParam = hContact // request custom status details for this contact
-//lParam = 0
-//return = (int)dwSequence // if successful it is sequence for ICQACKTYPE_XSTATUS_RESPONSE
+// wParam = hContact // request custom status details for this contact
+// lParam = 0
+// return = (int)dwSequence // if successful it is sequence for ICQACKTYPE_XSTATUS_RESPONSE
// 0 failed to request (e.g. auto-request enabled)
// -1 delayed (rate control) - sequence unknown
#define PS_ICQ_REQUESTCUSTOMSTATUS "/RequestXStatusDetails"
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;
}
|