diff options
| author | Alexander Gluzsky <sss123next@list.ru> | 2012-12-23 16:17:07 +0000 |
|---|---|---|
| committer | Alexander Gluzsky <sss123next@list.ru> | 2012-12-23 16:17:07 +0000 |
| commit | af8c5b336e9609ed9c53b877dd7f57fb3d7194b9 (patch) | |
| tree | f767b0911a71a12ddda0e3c1f85a775a4897b608 /plugins/New_GPG/src/utilities.cpp | |
| parent | 7bc7638adb66dd6110dfcb98aa74225b4c9c719c (diff) | |
fixed deadlock on new key
added accounts column to own key selection dialog
git-svn-id: http://svn.miranda-ng.org/main/trunk@2815 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/New_GPG/src/utilities.cpp')
| -rwxr-xr-x | plugins/New_GPG/src/utilities.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp index 3effa8aa48..5d9e9a2ecd 100755 --- a/plugins/New_GPG/src/utilities.cpp +++ b/plugins/New_GPG/src/utilities.cpp @@ -272,6 +272,7 @@ int onProtoAck(WPARAM w, LPARAM l) } if(_tcsstr(filename, _T(".gpg"))) //decrypt it { //process encrypted file + HistoryLog(ack->hContact, db_event("Recieved encrypted file, trying to decrypt", 0,0, 0));
if(_waccess(f->tszCurrentFile, 0) == -1) { if(errno == ENOENT) @@ -518,7 +519,7 @@ int onSendFile(WPARAM w, LPARAM l) CCSDATA *ccs=(CCSDATA*)l; if(isContactSecured(ccs->hContact)) { - + HistoryLog(ccs->hContact, db_event(Translate("encrypting file for transfer"), 0, 0, DBEF_SENT));
DWORD flags = (DWORD)ccs->wParam; //check for PFTS_UNICODE here int i; // if(flags & PFTS_UNICODE) //this does not work .... |