diff options
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/mir_app.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/miranda.h | 2 | ||||
| -rw-r--r-- | src/mir_app/src/proto_chains.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/proto_utils.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index c7b62601aa..5b47571ebc 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -121,6 +121,7 @@ GetPluginLangId @129 Proto_GetAccount @130
Proto_EnumProtocols @131
Proto_EnumAccounts @132
+Proto_GetContactAccount @133
Proto_GetBaseAccountName @135
Proto_AddToContact @137
Proto_ChainRecv @138
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 3885bb7d91..3c61daf61d 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -121,6 +121,7 @@ GetPluginLangId @129 Proto_GetAccount @130
Proto_EnumProtocols @131
Proto_EnumAccounts @132
+Proto_GetContactAccount @133
Proto_GetBaseAccountName @135
Proto_AddToContact @137
Proto_ChainRecv @138
diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h index 7878f792f7..ec43c2c428 100644 --- a/src/mir_app/src/miranda.h +++ b/src/mir_app/src/miranda.h @@ -164,8 +164,6 @@ extern LIST<MBaseProto> g_arFilters; INT_PTR ProtoCallService(const char *szModule, const char *szService, WPARAM wParam, LPARAM lParam);
-PROTOACCOUNT* __fastcall Proto_GetAccount(MCONTACT hContact);
-
PROTO_INTERFACE* AddDefaultAccount(const char *szProtoName);
int FreeDefaultAccount(PROTO_INTERFACE* ppi);
diff --git a/src/mir_app/src/proto_chains.cpp b/src/mir_app/src/proto_chains.cpp index c66d4e1230..83391ccc0d 100644 --- a/src/mir_app/src/proto_chains.cpp +++ b/src/mir_app/src/proto_chains.cpp @@ -134,7 +134,7 @@ MIR_APP_DLL(INT_PTR) Proto_ChainRecv(int iOrder, CCSDATA *ccs) return ret;
}
-PROTOACCOUNT* __fastcall Proto_GetAccount(MCONTACT hContact)
+MIR_APP_DLL(PROTOACCOUNT*) Proto_GetContactAccount(MCONTACT hContact)
{
if (hContact == 0)
return nullptr;
@@ -148,7 +148,7 @@ PROTOACCOUNT* __fastcall Proto_GetAccount(MCONTACT hContact) MIR_APP_DLL(char*) Proto_GetBaseAccountName(MCONTACT hContact)
{
- PROTOACCOUNT *pa = Proto_GetAccount(hContact);
+ PROTOACCOUNT *pa = Proto_GetContactAccount(hContact);
return pa->IsEnabled() ? pa->szModuleName : nullptr;
}
diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp index 78166d67ac..cbb86b6589 100644 --- a/src/mir_app/src/proto_utils.cpp +++ b/src/mir_app/src/proto_utils.cpp @@ -54,7 +54,7 @@ MIR_APP_DLL(PROTOCOLDESCRIPTOR*) Proto_IsProtocolLoaded(const char *szProtoName) MIR_APP_DLL(PROTO_INTERFACE *) Proto_GetInstance(MCONTACT hContact)
{
- PROTOACCOUNT *pa = Proto_GetAccount(hContact);
+ PROTOACCOUNT *pa = Proto_GetContactAccount(hContact);
if (pa == nullptr || pa->bOldProto)
return nullptr;
|