diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-12-13 20:19:46 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-12-13 20:19:46 +0300 |
| commit | 054bb1949247445a29a68812579800904edf6a02 (patch) | |
| tree | 6aecd3e738de818d45e703325b17f571baf02ee0 /protocols | |
| parent | 7657cf3cd9f3ae33e29091a947d76234997ebfd9 (diff) | |
MS_FILE_* services became useless since StdFile died
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/CloudFile/src/cloud_file.cpp | 5 | ||||
| -rw-r--r-- | protocols/IRCG/src/input.cpp | 9 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_svc.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_utils.cpp | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/protocols/CloudFile/src/cloud_file.cpp b/protocols/CloudFile/src/cloud_file.cpp index 8674789126..9f66caaf82 100644 --- a/protocols/CloudFile/src/cloud_file.cpp +++ b/protocols/CloudFile/src/cloud_file.cpp @@ -77,11 +77,10 @@ void CCloudService::OpenUploadDialog(MCONTACT hContact) auto it = InterceptedContacts.find(hContact); if (it == InterceptedContacts.end()) { - HWND hwnd = (HWND)CallService(MS_FILE_SENDFILE, hContact, 0); + HWND hwnd = File::Send(hContact); InterceptedContacts[hContact] = hwnd; } - else - SetActiveWindow(it->second); + else SetActiveWindow(it->second); } MWindow CCloudService::OnCreateAccMgrUI(MWindow hwndParent) diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp index 2fd51e9fd1..42d91b309c 100644 --- a/protocols/IRCG/src/input.cpp +++ b/protocols/IRCG/src/input.cpp @@ -624,14 +624,11 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo }
if (three.IsEmpty())
- CallService(MS_FILE_SENDFILE, ccNew, 0);
+ File::Send(ccNew);
else {
CMStringW temp = GetWordAddress(text, 3);
- wchar_t* pp[2];
- wchar_t* p = (wchar_t*)temp.c_str();
- pp[0] = p;
- pp[1] = nullptr;
- CallService(MS_FILE_SENDSPECIFICFILEST, ccNew, (LPARAM)pp);
+ wchar_t *pp[2] = { temp.GetBuffer(), 0 };
+ File::Send(ccNew, pp);
}
}
}
diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp index 5252c0865f..4a78c1101e 100644 --- a/protocols/JabberG/src/jabber_svc.cpp +++ b/protocols/JabberG/src/jabber_svc.cpp @@ -481,7 +481,7 @@ INT_PTR __cdecl CJabberProto::JabberServiceParseXmppURI(WPARAM, LPARAM lParam) hContact = DBCreateContact(jid, jid, true, true);
if (hContact == 0)
return 1;
- CallService(MS_FILE_SENDFILE, hContact, 0);
+ File::Send(hContact);
return 0;
}
diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp index fc7a4bb6b1..acd02c6892 100644 --- a/protocols/SkypeWeb/src/skype_utils.cpp +++ b/protocols/SkypeWeb/src/skype_utils.cpp @@ -632,7 +632,7 @@ INT_PTR CSkypeProto::ParseSkypeUriService(WPARAM, LPARAM lParam) if (!mir_wstrcmpi(szCommand, L"sendfile")) {
MCONTACT hContact = AddContact(_T2A(szJid), nullptr, true);
- CallService(MS_FILE_SENDFILE, hContact, NULL);
+ File::Send(hContact);
return 1;
}
|