diff options
| author | George Hazan <ghazan@miranda.im> | 2022-02-08 14:54:39 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-02-08 14:54:39 +0300 |
| commit | 12d95ea38599485662ec3f8541b14641c0254fb3 (patch) | |
| tree | 0ba353aac9011b7fd314138039fe1c115298b489 /protocols/Sametime | |
| parent | dd0c36ddb76469825c06f51a647dea64a85f7af5 (diff) | |
fixes #3022 (Jabber file transfers don't report failure)
Diffstat (limited to 'protocols/Sametime')
| -rw-r--r-- | protocols/Sametime/src/files.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/protocols/Sametime/src/files.cpp b/protocols/Sametime/src/files.cpp index daa8ccba13..8d81a8133c 100644 --- a/protocols/Sametime/src/files.cpp +++ b/protocols/Sametime/src/files.cpp @@ -26,7 +26,7 @@ void mwFileTransfer_offered(mwFileTransfer* ft) hContact = proto->AddContact(stuser, (proto->options.add_contacts ? false : true));
}
- proto->ProtoBroadcastAck(hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, (HANDLE)ft, 0);
+ proto->ProtoBroadcastAck(hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, (HANDLE)ft);
const char *filename = mwFileTransfer_getFileName(ft);
const char* message = mwFileTransfer_getMessage(ft);
@@ -98,7 +98,7 @@ void __cdecl SendThread(mwFileTransfer* ft) SleepEx(500,TRUE);
}
- proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, ftcd->hFt, 0);
+ proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, ftcd->hFt);
mwFileTransfer_removeClientData(ft);
if (ftcd->save_path) free(ftcd->save_path);
@@ -145,9 +145,9 @@ void mwFileTransfer_closed(mwFileTransfer* ft, guint32 code) }
if (code == mwFileTransfer_REJECTED)
- proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_DENIED, ftcd->hFt, 0);
+ proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_DENIED, ftcd->hFt);
else
- proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, ftcd->hFt, 0);
+ proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, ftcd->hFt);
if (ftcd->sending) {
FileTransferClientData* ftcd_next = ftcd->next;
@@ -181,12 +181,12 @@ void mwFileTransfer_closed(mwFileTransfer* ft, guint32 code) if (ftcd->sending) {
// check if we have more files to send...
if (ftcd->next) {
- proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, ftcd->hFt, 0);
+ proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, ftcd->hFt);
mwFileTransfer_offer(ftcd->next->ft);
}
}
else {
- proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, ftcd->hFt, 0);
+ proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, ftcd->hFt);
mwFileTransfer_removeClientData(ft);
if (ftcd->save_path)
@@ -212,7 +212,7 @@ void mwFileTransfer_recv(mwFileTransfer* ft, struct mwOpaque* data) if (!WriteFile(ftcd->hFile, data->data, data->len, &bytes_written, nullptr)) {
proto->debugLogW(L"mwFileTransfer_recv() !WriteFile");
mwFileTransfer_cancel(ft);
- proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, ftcd->hFt, 0);
+ proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, ftcd->hFt);
proto->debugLogW(L"mwFileTransfer_recv() ACKRESULT_FAILED");
}
else {
@@ -239,7 +239,7 @@ void mwFileTransfer_recv(mwFileTransfer* ft, struct mwOpaque* data) proto->debugLogW(L"mwFileTransfer_recv() ACKRESULT_DATA");
if (mwFileTransfer_isDone(ft)) {
- proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, ftcd->hFt, 0);
+ proto->ProtoBroadcastAck(ftcd->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, ftcd->hFt);
proto->debugLogW(L"mwFileTransfer_recv() ACKRESULT_SUCCESS");
}
}
|