From c56ccb6226b01eafec0c6370feda1415cc46f009 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Sep 2012 12:41:21 +0000 Subject: strange unused piece of code git-svn-id: http://svn.miranda-ng.org/main/trunk@1579 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IcqOscarJ/icq_proto.cpp | 23 +++-------------------- protocols/IcqOscarJ/icq_proto.h | 1 - 2 files changed, 3 insertions(+), 21 deletions(-) (limited to 'protocols') diff --git a/protocols/IcqOscarJ/icq_proto.cpp b/protocols/IcqOscarJ/icq_proto.cpp index 017bfe5482..90a56838bb 100755 --- a/protocols/IcqOscarJ/icq_proto.cpp +++ b/protocols/IcqOscarJ/icq_proto.cpp @@ -1593,9 +1593,9 @@ int __cdecl CIcqProto::SendMsg( HANDLE hContact, int flags, const char* pszSrc ) BOOL plain_ascii = IsUSASCII(puszText, strlennull(puszText)); - BOOL oldAnsi = plain_ascii || !m_bUtfEnabled || + BOOL oldAnsi = plain_ascii || !m_bUtfEnabled || (!(flags & (PREF_UTF | PREF_UNICODE)) && m_bUtfEnabled == 1) || - !CheckContactCapabilities(hContact, CAPF_UTF) || + !CheckContactCapabilities(hContact, CAPF_UTF) || !getSettingByte(hContact, "UnicodeSend", 1); if (m_bTempVisListEnabled && m_iStatus == ID_STATUS_INVISIBLE) @@ -1648,7 +1648,7 @@ int __cdecl CIcqProto::SendMsg( HANDLE hContact, int flags, const char* pszSrc ) // on failure, fallback to send thru server } - if (!dwUin || !CheckContactCapabilities(hContact, CAPF_SRV_RELAY) || + if (!dwUin || !CheckContactCapabilities(hContact, CAPF_SRV_RELAY) || wRecipientStatus == ID_STATUS_OFFLINE || wRecipientStatus == ID_STATUS_INVISIBLE || getSettingByte(hContact, "OnlyServerAcks", getSettingByte(NULL, "OnlyServerAcks", DEFAULT_ONLYSERVERACKS)) || !getSettingByte(hContact, "SlowSend", getSettingByte(NULL, "SlowSend", DEFAULT_SLOWSEND))) @@ -2087,23 +2087,6 @@ int __cdecl CIcqProto::SetStatus(int iNewStatus) return 0; } - -//////////////////////////////////////////////////////////////////////////////////////// -// RecvAuth - returns a contact's away message - -INT_PTR __cdecl CIcqProto::RecvAuth(WPARAM wParam, LPARAM lParam) -{ - CCSDATA* ccs = (CCSDATA*)lParam; - PROTORECVEVENT* pre = (PROTORECVEVENT*)ccs->lParam; - - setContactHidden(ccs->hContact, 0); - - ICQAddRecvEvent(NULL, EVENTTYPE_AUTHREQUEST, pre, pre->lParam, (PBYTE)pre->szMessage, 0); - - return 0; -} - - //////////////////////////////////////////////////////////////////////////////////////// // GetAwayMsgThread - return a contact's status message diff --git a/protocols/IcqOscarJ/icq_proto.h b/protocols/IcqOscarJ/icq_proto.h index ec1eabb338..aa903689ad 100755 --- a/protocols/IcqOscarJ/icq_proto.h +++ b/protocols/IcqOscarJ/icq_proto.h @@ -121,7 +121,6 @@ struct CIcqProto : public PROTO_INTERFACE, public MZeroedObject INT_PTR __cdecl GrantAuthorization(WPARAM wParam, LPARAM lParam); INT_PTR __cdecl menuXStatus(WPARAM wParam,LPARAM lParam,LPARAM fParam); INT_PTR __cdecl OpenWebProfile(WPARAM wParam, LPARAM lParam); - INT_PTR __cdecl RecvAuth(WPARAM wParam, LPARAM lParam); INT_PTR __cdecl RequestAdvStatusIconIdx(WPARAM wParam, LPARAM lParam); INT_PTR __cdecl RequestAuthorization(WPARAM wParam, LPARAM lParam); INT_PTR __cdecl RequestXStatusDetails(WPARAM wParam, LPARAM lParam); -- cgit v1.2.3