diff options
author | George Hazan <george.hazan@gmail.com> | 2013-06-15 18:21:33 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-06-15 18:21:33 +0000 |
commit | 683c656dd87e82ec9e2d05f72a7b7e1c7269bfd6 (patch) | |
tree | dbd36275d84fe57ae7e60f7765275b1ad1f13ed1 /protocols/Yahoo/src/file_transfer.cpp | |
parent | a9fc5c1795cea571927f6ff4ceb8701ffe609ad4 (diff) |
ProtoBroadcastAck - unified helper for all protocols
git-svn-id: http://svn.miranda-ng.org/main/trunk@4962 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Yahoo/src/file_transfer.cpp')
-rw-r--r-- | protocols/Yahoo/src/file_transfer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/protocols/Yahoo/src/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp index 46acda427b..999ef0c3a6 100644 --- a/protocols/Yahoo/src/file_transfer.cpp +++ b/protocols/Yahoo/src/file_transfer.cpp @@ -177,11 +177,11 @@ static void upload_file(int id, int fd, int error, void *data) LOG(("proto: %s, hContact: %p", sf->ppro->m_szModuleName, sf->hContact));
LOG(("Sending file: %s", fi->filename));
- //ProtoBroadcastAck(m_szModuleName, sf->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTING, sf, 0);
- //ProtoBroadcastAck(m_szModuleName, sf->hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, sf, 0);
+ //ProtoBroadcastAck(sf->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTING, sf, 0);
+ //ProtoBroadcastAck(sf->hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, sf, 0);
ProtoBroadcastAck(sf->ppro->m_szModuleName, sf->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, sf, 0);
- //ProtoBroadcastAck(m_szModuleName, sf->hContact, ACKTYPE_FILE, ACKRESULT_SENTREQUEST, sf, 0);
- //ProtoBroadcastAck(m_szModuleName, sf->hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, sf, 0);
+ //ProtoBroadcastAck(sf->hContact, ACKTYPE_FILE, ACKRESULT_SENTREQUEST, sf, 0);
+ //ProtoBroadcastAck(sf->hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, sf, 0);
do {
ReadFile(myhFile, buf, sizeof(buf), &dw, NULL);
@@ -465,7 +465,7 @@ void __cdecl CYahooProto::recv_filethread(void *psf) y_filetransfer *sf = ( y_filetransfer* )psf;
struct yahoo_file_info *fi = (struct yahoo_file_info *)sf->files->data;
- ProtoBroadcastAck(m_szModuleName, sf->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTING, sf, 0);
+ ProtoBroadcastAck(sf->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTING, sf, 0);
DebugLog("[yahoo_recv_filethread] who: %s, msg: %s, filename: %s ", sf->who, sf->msg, fi->filename);
@@ -597,7 +597,7 @@ void CYahooProto::ext_got_file7info(const char *me, const char *who, const char return;
}
- ProtoBroadcastAck(m_szModuleName, ft->hContact, ACKTYPE_GETINFO, ACKRESULT_SUCCESS, (HANDLE) 1, 0);
+ ProtoBroadcastAck(ft->hContact, ACKTYPE_GETINFO, ACKRESULT_SUCCESS, (HANDLE) 1, 0);
FREE(ft->url);
@@ -681,7 +681,7 @@ void __cdecl CYahooProto::send_filethread(void *psf) y_filetransfer *sf = s->sf;
struct yahoo_file_info *fi = (struct yahoo_file_info *)sf->files->data;
- ProtoBroadcastAck(m_szModuleName, sf->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTING, sf, 0);
+ ProtoBroadcastAck(sf->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTING, sf, 0);
LOG(("who %s, msg: %s, filename: %s filesize: %ld", sf->who, sf->msg, fi->filename, fi->filesize));
|