diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-19 14:24:12 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-19 14:24:12 +0000 |
| commit | 83310365c69bd40365ee0ae0e16c99c28e24cd0b (patch) | |
| tree | 10ac18bfdc3fcf0fd62a5aba3ccb5dedffa2e410 /protocols/IcqOscarJ | |
| parent | d68cd04d6f7b997692476b531bdc30f546a50efd (diff) | |
- 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
Diffstat (limited to 'protocols/IcqOscarJ')
| -rw-r--r-- | protocols/IcqOscarJ/src/init.cpp | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/stdafx.h | 1 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/utilities.cpp | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp index a2d005fe47..ddaec0e16c 100644 --- a/protocols/IcqOscarJ/src/init.cpp +++ b/protocols/IcqOscarJ/src/init.cpp @@ -108,7 +108,7 @@ extern "C" int __declspec(dllexport) Load(void) pd.type = PROTOTYPE_PROTOCOL;
pd.fnInit = icqProtoInit;
pd.fnUninit = icqProtoUninit;
- CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);
+ Proto_RegisterModule(&pd);
// Initialize charset conversion routines
InitI18N();
diff --git a/protocols/IcqOscarJ/src/stdafx.h b/protocols/IcqOscarJ/src/stdafx.h index 431c4dcf10..b28a33ae00 100644 --- a/protocols/IcqOscarJ/src/stdafx.h +++ b/protocols/IcqOscarJ/src/stdafx.h @@ -63,7 +63,6 @@ #include <m_message.h>
#include <m_netlib.h>
#include <m_protocols.h>
-#include <m_protomod.h>
#include <m_protosvc.h>
#include <m_options.h>
#include <m_system.h>
diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp index 3a5974df1a..9071a5a8bd 100644 --- a/protocols/IcqOscarJ/src/utilities.cpp +++ b/protocols/IcqOscarJ/src/utilities.cpp @@ -448,7 +448,7 @@ MCONTACT CIcqProto::HContactFromUIN(DWORD dwUin, int *Added) return INVALID_CONTACT_ID;
}
- if (CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)m_szModuleName) != 0) {
+ if (Proto_AddToContact(hContact, m_szModuleName) != 0) {
// For some reason we failed to register the protocol to this contact
CallService(MS_DB_CONTACT_DELETE, hContact, 0);
debugLogA("Failed to register ICQ contact %u", dwUin);
@@ -514,7 +514,7 @@ MCONTACT CIcqProto::HContactFromUID(DWORD dwUin, const char *szUid, int *Added) debugLogA("Attempt to create ICQ contact by string <%s>", szUid);
hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
- CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)m_szModuleName);
+ Proto_AddToContact(hContact, m_szModuleName);
setString(hContact, UNIQUEIDSETTING, szUid);
|