diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2011-03-19 01:05:07 +0200 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2011-03-19 01:05:07 +0200 |
| commit | 70042db65c8d8ada267826e823a5465631aac619 (patch) | |
| tree | 6bf42533418607742df6163fd3b27cb7946c02e1 /utilities.cpp | |
| parent | d116d404808e9ae9a7860c1eecf0b5974b91c994 (diff) | |
modified: new_gpg.vcxproj
modified: utilities.cpp
Diffstat (limited to 'utilities.cpp')
| -rw-r--r-- | utilities.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/utilities.cpp b/utilities.cpp index 115c2bf..2248cf0 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -272,9 +272,12 @@ int OnPreBuildContactMenu(WPARAM w, LPARAM l) list<wstring> transfers; +extern bool bFileTransfers; int onProtoAck(WPARAM w, LPARAM l) { + if(!bFileTransfers) + return 0; ACKDATA *ack=(ACKDATA*)l; CCSDATA *ccs=(CCSDATA*)ack->lParam; if (ack->type!=ACKTYPE_FILE) @@ -351,10 +354,11 @@ int onProtoAck(WPARAM w, LPARAM l) return 0; } - //from secureim partially int onSendFile(WPARAM w, LPARAM l) { + if(!bFileTransfers) + return 0; CCSDATA *ccs=(CCSDATA*)l; if(isContactSecured(ccs->hContact)) { @@ -430,8 +434,8 @@ int onSendFile(WPARAM w, LPARAM l) } } } - mir_free(file[i]); - file[i]=mir_wstrdup(path_out.c_str()); +// mir_free(file[i]); + file[i]=mir_tstrdup(path_out.c_str()); delete [] file_out; transfers.push_back(path_out); } |