From 501fd1fbff6afc11bb0368b82b4a8d9451bee5f3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 18 Jan 2019 21:13:56 +0300 Subject: we don't need PSR_URL as well --- src/mir_app/src/ignore.cpp | 9 -------- src/mir_app/src/mir_app.def | 1 - src/mir_app/src/mir_app64.def | 1 - src/mir_app/src/proto_internal.cpp | 6 ----- src/mir_app/src/proto_utils.cpp | 5 ----- src/mir_app/src/protocols.cpp | 46 ++++++++++++++++++-------------------- 6 files changed, 22 insertions(+), 46 deletions(-) (limited to 'src/mir_app') diff --git a/src/mir_app/src/ignore.cpp b/src/mir_app/src/ignore.cpp index ae2c2a341c..c7da59c362 100644 --- a/src/mir_app/src/ignore.cpp +++ b/src/mir_app/src/ignore.cpp @@ -379,14 +379,6 @@ static INT_PTR IgnoreRecvMessage(WPARAM wParam, LPARAM lParam) return Proto_ChainRecv(wParam, ccs); } -static INT_PTR IgnoreRecvUrl(WPARAM wParam, LPARAM lParam) -{ - CCSDATA *ccs = (CCSDATA*)lParam; - if (IsIgnored(ccs->hContact, IGNOREEVENT_URL)) - return 1; - return Proto_ChainRecv(wParam, ccs); -} - static INT_PTR IgnoreRecvFile(WPARAM wParam, LPARAM lParam) { CCSDATA *ccs = (CCSDATA*)lParam; @@ -419,7 +411,6 @@ int LoadIgnoreModule(void) Proto_RegisterModule(PROTOTYPE_IGNORE, "Ignore"); CreateProtoServiceFunction("Ignore", PSR_MESSAGE, IgnoreRecvMessage); - CreateProtoServiceFunction("Ignore", PSR_URL, IgnoreRecvUrl); CreateProtoServiceFunction("Ignore", PSR_FILE, IgnoreRecvFile); CreateProtoServiceFunction("Ignore", PSR_AUTH, IgnoreRecvAuth); diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 3aee20c8d4..b7feb9939b 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -56,7 +56,6 @@ Skin_GetIconName @24 ?RecvContacts@PROTO_INTERFACE@@UAEHIPAUPROTORECVEVENT@@@Z @58 NONAME ?RecvFile@PROTO_INTERFACE@@UAEHIPAUPROTORECVFILE@@@Z @59 NONAME ?RecvMsg@PROTO_INTERFACE@@UAEIIPAUPROTORECVEVENT@@@Z @60 NONAME -?RecvUrl@PROTO_INTERFACE@@UAEHIPAUPROTORECVEVENT@@@Z @61 NONAME ?SearchAdvanced@PROTO_INTERFACE@@UAEPAUHWND__@@PAU2@@Z @62 NONAME ?SearchBasic@PROTO_INTERFACE@@UAEPAXPB_W@Z @63 NONAME ?SearchByEmail@PROTO_INTERFACE@@UAEPAXPB_W@Z @64 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 208676636e..f4fc8d7df4 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -56,7 +56,6 @@ Skin_GetIconName @24 ?RecvContacts@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVEVENT@@@Z @58 NONAME ?RecvFile@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVFILE@@@Z @59 NONAME ?RecvMsg@PROTO_INTERFACE@@UEAAIIPEAUPROTORECVEVENT@@@Z @60 NONAME -?RecvUrl@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVEVENT@@@Z @61 NONAME ?SearchAdvanced@PROTO_INTERFACE@@UEAAPEAUHWND__@@PEAU2@@Z @62 NONAME ?SearchBasic@PROTO_INTERFACE@@UEAAPEAXPEB_W@Z @63 NONAME ?SearchByEmail@PROTO_INTERFACE@@UEAAPEAXPEB_W@Z @64 NONAME diff --git a/src/mir_app/src/proto_internal.cpp b/src/mir_app/src/proto_internal.cpp index 919d779c56..4bd2dfca4d 100644 --- a/src/mir_app/src/proto_internal.cpp +++ b/src/mir_app/src/proto_internal.cpp @@ -206,12 +206,6 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE return (res == CALLSERVICE_NOTFOUND) ? -1 : (int)res; } - int RecvUrl(MCONTACT hContact, PROTORECVEVENT* evt) override - { - CCSDATA ccs = { hContact, PSR_URL, 0, (LPARAM)evt }; - return (int)ProtoCallService(m_szModuleName, PSR_URL, 0, (LPARAM)&ccs); - } - int SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList) override { CCSDATA ccs = { hContact, PSS_CONTACTS, MAKEWPARAM(flags, nContacts), (LPARAM)hContactsList }; diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp index 6b3a6aa40a..9e575e3d00 100644 --- a/src/mir_app/src/proto_utils.cpp +++ b/src/mir_app/src/proto_utils.cpp @@ -535,11 +535,6 @@ MEVENT PROTO_INTERFACE::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre) return (INT_PTR)db_event_add(hContact, &dbei); } -int PROTO_INTERFACE::RecvUrl(MCONTACT, PROTORECVEVENT*) -{ - return 1; // error -} - int PROTO_INTERFACE::SendContacts(MCONTACT, int, int, MCONTACT*) { return 1; // error diff --git a/src/mir_app/src/protocols.cpp b/src/mir_app/src/protocols.cpp index e2eb88bbc4..28a893f770 100644 --- a/src/mir_app/src/protocols.cpp +++ b/src/mir_app/src/protocols.cpp @@ -64,18 +64,17 @@ static TServiceListItem serviceItems[] = { PSR_CONTACTS, 20 }, { PSR_FILE, 21 }, { PSR_MESSAGE, 22 }, - { PSR_URL, 23 }, - { PSS_CONTACTS, 24 }, - { PSS_FILE, 25 }, - { PSS_MESSAGE, 26 }, - { PSS_SETAPPARENTMODE, 27 }, - { PS_SETSTATUS, 28 }, - { PSS_GETAWAYMSG, 29 }, - { PSR_AWAYMSG, 30 }, - { PS_SETAWAYMSG, 31 }, - { PSS_USERISTYPING, 32 }, - { PS_GETNAME, 33 }, - { PS_GETSTATUS, 34 } + { PSS_CONTACTS, 23 }, + { PSS_FILE, 24 }, + { PSS_MESSAGE, 25 }, + { PSS_SETAPPARENTMODE, 26 }, + { PS_SETSTATUS, 27 }, + { PSS_GETAWAYMSG, 28 }, + { PSR_AWAYMSG, 29 }, + { PS_SETAWAYMSG, 30 }, + { PSS_USERISTYPING, 31 }, + { PS_GETNAME, 32 }, + { PS_GETSTATUS, 33 } }; //------------------------------------------------------------------------------------ @@ -425,18 +424,17 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char case 20: return (INT_PTR)ppi->RecvContacts(hContact, (PROTORECVEVENT*)lParam); case 21: return (INT_PTR)ppi->RecvFile(hContact, (PROTORECVFILE*)lParam); case 22: return (INT_PTR)ppi->RecvMsg(hContact, (PROTORECVEVENT*)lParam); - case 23: return (INT_PTR)ppi->RecvUrl(hContact, (PROTORECVEVENT*)lParam); - case 24: return (INT_PTR)ppi->SendContacts(hContact, LOWORD(wParam), HIWORD(wParam), (MCONTACT*)lParam); - case 25: return (INT_PTR)ppi->SendFile(hContact, (wchar_t*)wParam, (wchar_t**)lParam); - case 26: return (INT_PTR)ppi->SendMsg(hContact, wParam, (const char*)lParam); - case 27: return (INT_PTR)ppi->SetApparentMode(hContact, wParam); - case 28: return (INT_PTR)ppi->SetStatus(wParam); - case 29: return (INT_PTR)ppi->GetAwayMsg(hContact); - case 30: return (INT_PTR)ppi->RecvAwayMsg(hContact, wParam, (PROTORECVEVENT*)lParam); - case 31: return (INT_PTR)ppi->SetAwayMsg(wParam, (wchar_t*)lParam); - case 32: return (INT_PTR)ppi->UserIsTyping(wParam, lParam); - case 33: mir_strncpy((char*)lParam, ppi->m_szModuleName, wParam); return 0; - case 34: + case 23: return (INT_PTR)ppi->SendContacts(hContact, LOWORD(wParam), HIWORD(wParam), (MCONTACT*)lParam); + case 24: return (INT_PTR)ppi->SendFile(hContact, (wchar_t*)wParam, (wchar_t**)lParam); + case 25: return (INT_PTR)ppi->SendMsg(hContact, wParam, (const char*)lParam); + case 26: return (INT_PTR)ppi->SetApparentMode(hContact, wParam); + case 27: return (INT_PTR)ppi->SetStatus(wParam); + case 28: return (INT_PTR)ppi->GetAwayMsg(hContact); + case 29: return (INT_PTR)ppi->RecvAwayMsg(hContact, wParam, (PROTORECVEVENT*)lParam); + case 30: return (INT_PTR)ppi->SetAwayMsg(wParam, (wchar_t*)lParam); + case 31: return (INT_PTR)ppi->UserIsTyping(wParam, lParam); + case 32: mir_strncpy((char*)lParam, ppi->m_szModuleName, wParam); return 0; + case 33: return ppi->m_iStatus; } } -- cgit v1.2.3