diff options
| author | George Hazan <ghazan@miranda.im> | 2020-05-07 17:08:24 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-05-07 17:08:24 +0300 |
| commit | c970f5a11e85c4efe5a27783c7c8d994c55daf8b (patch) | |
| tree | fa8c6aa5c7de40f9066ea022bb136e96e262daae /protocols/JabberG | |
| parent | b13f39a263e1969ec35006daf8f1f5cb4fb924b3 (diff) | |
fix for old PROTO_INTERFACE::FileResume interface error
Diffstat (limited to 'protocols/JabberG')
| -rwxr-xr-x | protocols/JabberG/src/jabber_proto.cpp | 6 | ||||
| -rwxr-xr-x | protocols/JabberG/src/jabber_proto.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index fe623c111f..be945eb154 100755 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -567,14 +567,14 @@ int CJabberProto::FileDeny(MCONTACT, HANDLE hTransfer, const wchar_t *) ////////////////////////////////////////////////////////////////////////////////////////
// JabberFileResume - processes file renaming etc
-int CJabberProto::FileResume(HANDLE hTransfer, int *action, const wchar_t **szFilename)
+int CJabberProto::FileResume(HANDLE hTransfer, int, const wchar_t *szFilename)
{
filetransfer *ft = (filetransfer*)hTransfer;
if (!m_bJabberOnline || ft == nullptr)
return 1;
- if (*action == FILERESUME_RENAME)
- replaceStrW(ft->std.szCurrentFile.w, *szFilename);
+ if (szFilename != nullptr)
+ replaceStrW(ft->std.szCurrentFile.w, szFilename);
SetEvent(ft->hWaitEvent);
return 0;
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index a5a6c85974..99a116768f 100755 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -105,7 +105,7 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface // PROTO_INTERFACE
//====================================================================================
- MCONTACT AddToList(int flags, PROTOSEARCHRESULT* psr) override;
+ MCONTACT AddToList(int flags, PROTOSEARCHRESULT *psr) override;
MCONTACT AddToListByEvent(int flags, int iContact, MEVENT hDbEvent) override;
int Authorize(MEVENT hDbEvent) override;
@@ -115,7 +115,7 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface HANDLE FileAllow(MCONTACT hContact, HANDLE hTransfer, const wchar_t *szPath) override;
int FileCancel(MCONTACT hContact, HANDLE hTransfer) override;
int FileDeny(MCONTACT hContact, HANDLE hTransfer, const wchar_t *szReason) override;
- int FileResume(HANDLE hTransfer, int* action, const wchar_t** szFilename) override;
+ int FileResume(HANDLE hTransfer, int action, const wchar_t *szFilename) override;
INT_PTR GetCaps(int type, MCONTACT hContact = 0) override;
int GetInfo(MCONTACT hContact, int infoType) override;
|