From 04f25368c5b4082e5d05d25627c83bd5745ed782 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Fri, 24 Sep 2010 09:10:22 +0300 Subject: modified: commonheaders.h modified: utilities.cpp --- utilities.cpp | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'utilities.cpp') diff --git a/utilities.cpp b/utilities.cpp index dc86ecf..271afb2 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -278,18 +278,41 @@ int onProtoAck(WPARAM w, LPARAM l) if (ack->type!=ACKTYPE_FILE) return 0; if(!isContactHaveKey(ack->hContact)) - return 0; + return 0; PROTOFILETRANSFERSTATUS *f = (PROTOFILETRANSFERSTATUS*) ack->lParam; - if (f && f->sending && !bFileTransfers) + if (f && (f->flags & PFTS_SENDING) && !bFileTransfers) return 0; + if(!f) + f = (PROTOFILETRANSFERSTATUS*) ack->hProcess; + switch(ack->result) { case ACKRESULT_DENIED: case ACKRESULT_FAILED: { + if(!f->tszWorkingDir) + return 0; + if(_tcsstr(f->tszCurrentFile, _T(".gpg"))) + ; + } + break; + case ACKRESULT_NEXTFILE: case ACKRESULT_FILERESUME: //works only on receiving (than it useless ...) + { + wstring str = _T("Next:\n"); + str.append(f->tszCurrentFile).append(_T("\n")); + MessageBox(0, str.c_str(), _T(""), MB_OK); } break; - case ACKRESULT_NEXTFILE: case ACKRESULT_SUCCESS: + case ACKRESULT_SUCCESS: { + if(!f->tszWorkingDir) + return 0; + if(_tcsstr(f->tszCurrentFile, _T(".gpg"))) + { //process encrypted file + if(f->flags & PFTS_SENDING) + DeleteFile(f->tszCurrentFile); + if(f->flags & PFTS_RECEIVING) + ; + } } break; } -- cgit v1.2.3