From 83310365c69bd40365ee0ae0e16c99c28e24cd0b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 19 Jun 2015 14:24:12 +0000 Subject: - all static protocol services replaced with functions; - m_protomod.h removed as useless git-svn-id: http://svn.miranda-ng.org/main/trunk@14260 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/YAMN/src/main.cpp | 2 +- plugins/YAMN/src/proto/pop3/pop3comm.cpp | 2 +- plugins/YAMN/src/services.cpp | 2 +- plugins/YAMN/src/yamn.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/YAMN') diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp index 4a2a341cfc..0f5b14e4f1 100644 --- a/plugins/YAMN/src/main.cpp +++ b/plugins/YAMN/src/main.cpp @@ -286,7 +286,7 @@ extern "C" int __declspec(dllexport) Load(void) PROTOCOLDESCRIPTOR pd = { PROTOCOLDESCRIPTOR_V3_SIZE }; pd.szName = YAMN_DBMODULE; pd.type = PROTOTYPE_VIRTUAL; - CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd); + Proto_RegisterModule(&pd); InitializeCriticalSection(&AccountStatusCS); InitializeCriticalSection(&FileWritingCS); diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp index a8f458ebd7..90d9cd5fbf 100644 --- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp @@ -303,7 +303,7 @@ int RegisterPOP3Plugin(WPARAM, LPARAM) if (!Finder->hContact && (Finder->Flags & YAMN_ACC_ENA) && (Finder->NewMailN.Flags & YAMN_ACC_CONT)) { //No account contact found, have to create one Finder->hContact = CallService(MS_DB_CONTACT_ADD, 0, 0); - CallService(MS_PROTO_ADDTOCONTACT, Finder->hContact, (LPARAM)YAMN_DBMODULE); + Proto_AddToContact(Finder->hContact, YAMN_DBMODULE); db_set_s(Finder->hContact, YAMN_DBMODULE, "Id", Finder->Name); db_set_s(Finder->hContact, YAMN_DBMODULE, "Nick", Finder->Name); db_set_s(Finder->hContact, "Protocol", "p", YAMN_DBMODULE); diff --git a/plugins/YAMN/src/services.cpp b/plugins/YAMN/src/services.cpp index 209e26ce5f..812dfd7e41 100644 --- a/plugins/YAMN/src/services.cpp +++ b/plugins/YAMN/src/services.cpp @@ -484,7 +484,7 @@ void RefreshContact(void) } else if ((Finder->Flags & YAMN_ACC_ENA) && (Finder->NewMailN.Flags & YAMN_ACC_CONT)) { Finder->hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0); - CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)Finder->hContact, (LPARAM)YAMN_DBMODULE); + Proto_AddToContact(Finder->hContact, YAMN_DBMODULE); db_set_s(Finder->hContact, YAMN_DBMODULE, "Id", Finder->Name); db_set_s(Finder->hContact, YAMN_DBMODULE, "Nick", Finder->Name); db_set_s(Finder->hContact, "Protocol", "p", YAMN_DBMODULE); diff --git a/plugins/YAMN/src/yamn.h b/plugins/YAMN/src/yamn.h index 5e3f80b0f9..29955fcc7c 100644 --- a/plugins/YAMN/src/yamn.h +++ b/plugins/YAMN/src/yamn.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.3