summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Clist_modern/src/modern_awaymsg.cpp2
-rw-r--r--plugins/NewAwaySysMod/src/ReadAwayMsg.cpp2
-rw-r--r--plugins/NewXstatusNotify/src/popup.cpp2
-rw-r--r--plugins/SimpleStatusMsg/src/awaymsg.cpp4
-rw-r--r--plugins/TipperYM/src/message_pump.cpp2
-rw-r--r--plugins/TipperYM/src/subst.cpp2
-rw-r--r--plugins/UserInfoEx/src/dlg_propsheet.cpp8
-rw-r--r--plugins/UserInfoEx/src/svc_refreshci.cpp2
-rw-r--r--plugins/WhenWasIt/src/services.cpp2
9 files changed, 13 insertions, 13 deletions
diff --git a/plugins/Clist_modern/src/modern_awaymsg.cpp b/plugins/Clist_modern/src/modern_awaymsg.cpp
index 95ecfe2689..449edd481a 100644
--- a/plugins/Clist_modern/src/modern_awaymsg.cpp
+++ b/plugins/Clist_modern/src/modern_awaymsg.cpp
@@ -90,7 +90,7 @@ static void amThreadProc(void *)
ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact);
- HANDLE ACK = (HANDLE)ProtoChainSend(hContact, PSS_GETAWAYMSG, 0, 0);
+ HANDLE ACK = (HANDLE)CallContactService(hContact, PS_GETAWAYMSG);
if (!ACK) {
ACKDATA ack;
ack.hContact = hContact;
diff --git a/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp b/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
index 241d1777d0..25d8f59b75 100644
--- a/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
@@ -59,7 +59,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)awayData);
awayData->hContact = lParam;
awayData->hAwayMsgEvent = HookEventMessage(ME_PROTO_ACK, hwndDlg, UM_RAM_AWAYMSGACK);
- awayData->hSeq = (HANDLE)ProtoChainSend(awayData->hContact, PSS_GETAWAYMSG, 0, 0);
+ awayData->hSeq = (HANDLE)CallContactService(awayData->hContact, PS_GETAWAYMSG);
WindowList_Add(g_hReadWndList, hwndDlg, awayData->hContact);
wchar_t str[256], format[128];
diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp
index 6c43a08686..4b4904fa2c 100644
--- a/plugins/NewXstatusNotify/src/popup.cpp
+++ b/plugins/NewXstatusNotify/src/popup.cpp
@@ -105,7 +105,7 @@ void QueryAwayMessage(HWND hWnd, PLUGINDATA *pdp)
// The following HookEventMessage will hook the ME_PROTO_ACK event and send a WM_AWAYMSG to hWnd when the hooks get notified.
pdp->hAwayMsgHook = HookEventParam(ME_PROTO_ACK, AwayMsgHook, (LPARAM)pdp);
// The following instruction asks Miranda to retrieve the away message and associates a hProcess (handle) to this request. This handle will appear in the ME_PROTO_ACK event.
- pdp->hAwayMsgProcess = (HANDLE)ProtoChainSend(hContact, PSS_GETAWAYMSG, 0, 0);
+ pdp->hAwayMsgProcess = (HANDLE)CallContactService(hContact, PS_GETAWAYMSG);
}
}
}
diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp
index 08c2670ccd..612e3d6e19 100644
--- a/plugins/SimpleStatusMsg/src/awaymsg.cpp
+++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp
@@ -50,7 +50,7 @@ public:
bool OnInitDialog() override
{
- m_hSeq = (HANDLE)ProtoChainSend(m_hContact, PSS_GETAWAYMSG, 0, 0);
+ m_hSeq = (HANDLE)CallContactService(m_hContact, PS_GETAWAYMSG, 0, 0);
m_hAwayMsgEvent = m_hSeq ? HookEventMessage(ME_PROTO_ACK, m_hwnd, HM_AWAYMSG) : nullptr;
WindowList_Add(hWindowList, m_hwnd, m_hContact);
@@ -150,7 +150,7 @@ public:
bool OnInitDialog() override
{
- m_hSeq = (HANDLE)ProtoChainSend(m_hContact, PSS_GETAWAYMSG, 0, 0);
+ m_hSeq = (HANDLE)CallContactService(m_hContact, PS_GETAWAYMSG, 0, 0);
m_hAwayMsgEvent = m_hSeq ? HookEventMessage(ME_PROTO_ACK, m_hwnd, HM_AWAYMSG) : nullptr;
WindowList_Add(hWindowList2, m_hwnd, m_hContact);
diff --git a/plugins/TipperYM/src/message_pump.cpp b/plugins/TipperYM/src/message_pump.cpp
index fd851af172..ec252d07a3 100644
--- a/plugins/TipperYM/src/message_pump.cpp
+++ b/plugins/TipperYM/src/message_pump.cpp
@@ -55,7 +55,7 @@ bool NeedWaitForContent(CLCINFOTIPEX *clcitex)
if (opt.bWaitForStatusMsg && !bStatusMsgReady) {
g_plugin.delSetting(hContact, "TempStatusMsg");
- if (CanRetrieveStatusMsg(hContact, szProto) && ProtoChainSend(hContact, PSS_GETAWAYMSG, 0, 0)) {
+ if (CanRetrieveStatusMsg(hContact, szProto) && CallContactService(hContact, PS_GETAWAYMSG, 0, 0)) {
if (WaitForContentTimerID)
KillTimer(nullptr, WaitForContentTimerID);
diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp
index 9f929b59fd..e2ffcdba4e 100644
--- a/plugins/TipperYM/src/subst.cpp
+++ b/plugins/TipperYM/src/subst.cpp
@@ -220,7 +220,7 @@ wchar_t* GetStatusMessageText(MCONTACT hContact)
if (!swzMsg) {
if (CanRetrieveStatusMsg(hContact, szProto))
- if (ProtoChainSend(hContact, PSS_GETAWAYMSG, 0, 0))
+ if (CallContactService(hContact, PS_GETAWAYMSG, 0, 0))
return nullptr;
if (!db_get_ws(hContact, "CList", "StatusMsg", &dbv)) {
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 28fb93902e..f14314f984 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -1225,12 +1225,12 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
// need meta contact's subcontact information
if (DB::Module::IsMetaAndScan(pPs->pszProto)) {
- // count valid subcontacts whose protocol supports the PSS_GETINFO service to update the information
+ // count valid subcontacts whose protocol supports the PS_GETINFO service to update the information
int numSubs = db_mc_getSubCount(pPs->hContact);
for (int i = 0; i < numSubs; i++) {
MCONTACT hSubContact = db_mc_getSub(pPs->hContact, i);
if (hSubContact) {
- if (ProtoServiceExists(Proto_GetBaseAccountName(hSubContact), PSS_GETINFO)) {
+ if (ProtoServiceExists(Proto_GetBaseAccountName(hSubContact), PS_GETINFO)) {
pPs->infosUpdated = (TAckInfo *)mir_realloc(pPs->infosUpdated, sizeof(TAckInfo) * (pPs->nSubContacts + 1));
pPs->infosUpdated[pPs->nSubContacts].hContact = hSubContact;
pPs->infosUpdated[pPs->nSubContacts].acks = nullptr;
@@ -1245,7 +1245,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
// call the services
for (int i = 0; i < pPs->nSubContacts; i++)
- if (!ProtoChainSend(pPs->infosUpdated[pPs->nSubContacts].hContact, PSS_GETINFO, NULL, NULL))
+ if (!CallContactService(pPs->infosUpdated[pPs->nSubContacts].hContact, PS_GETINFO))
bDo = TRUE;
if (bDo) {
@@ -1255,7 +1255,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
}
}
}
- else if (!ProtoChainSend(pPs->hContact, PSS_GETINFO, NULL, NULL)) {
+ else if (!CallContactService(pPs->hContact, PS_GETINFO)) {
pPs->infosUpdated = (TAckInfo *)mir_calloc(sizeof(TAckInfo));
pPs->infosUpdated[0].hContact = pPs->hContact;
pPs->nSubContacts = 1;
diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp
index 77a2076b48..d77d5d6a18 100644
--- a/plugins/UserInfoEx/src/svc_refreshci.cpp
+++ b/plugins/UserInfoEx/src/svc_refreshci.cpp
@@ -594,7 +594,7 @@ class CContactUpdater : public CContactQueue
_pProgress->SetTextParam(TranslateT("[b]%s (%S)...[/b]\n%d Contacts remaining"), Clist_GetContactDisplayName(_hContact), pszProto, Size());
if (IsProtoOnline(pszProto))
- for (int i = 0; i < 3 && ProtoChainSend(hContact, PSS_GETINFO, 0, 0); i++)
+ for (int i = 0; i < 3 && CallContactService(hContact, PS_GETINFO, 0, 0); i++)
Sleep(3000);
}
}
diff --git a/plugins/WhenWasIt/src/services.cpp b/plugins/WhenWasIt/src/services.cpp
index 7ea3973d82..5c1c6bb3b3 100644
--- a/plugins/WhenWasIt/src/services.cpp
+++ b/plugins/WhenWasIt/src/services.cpp
@@ -123,7 +123,7 @@ void __cdecl RefreshUserDetailsWorkerThread(void*)
MCONTACT hContact = db_find_first();
while (hContact != NULL) {
- ProtoChainSend(hContact, PSS_GETINFO, 0, 0);
+ CallContactService(hContact, PS_GETINFO);
hContact = db_find_next(hContact);
if (hContact)
Sleep(delay); //sleep for a few seconds between requests
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 22:17:05 +0000