summaryrefslogtreecommitdiff
path: root/plugins/New_GPG/src
diff options
context:
space:
mode:
authorAlexander Gluzsky <sss123next@list.ru>2012-08-22 03:18:58 +0000
committerAlexander Gluzsky <sss123next@list.ru>2012-08-22 03:18:58 +0000
commit296e6a8691de536c706babe5980eaddeb3e2a471 (patch)
treed463c3259eef5ecc0a59656074603a15f0275177 /plugins/New_GPG/src
parentd1f33e658727c85581f40579f4aa0ef8f512c0fe (diff)
unneeded db variable removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@1519 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/New_GPG/src')
-rwxr-xr-xplugins/New_GPG/src/messages.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index 73522424d5..5dc673c024 100755
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
@@ -392,8 +392,6 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
{
s2 += _tcslen(_T("-----END PGP PUBLIC KEY BLOCK-----"));
DBWriteContactSettingTString(ccs->hContact, szGPGModuleName, "GPGPubKey", str.substr(s1,s2-s1).c_str());
- DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 1);
- DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "bViaAutoExchange", 1);
{ //gpg execute block
wstring cmd;
TCHAR tmp2[MAX_PATH] = {0};
@@ -490,6 +488,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
DBWriteContactSettingString(ccs->hContact, szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
mir_free(tmp);
}
+ DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 1);
DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "bAlwatsTrust", 1);
void setSrmmIcon(HANDLE);
void setClistIcon(HANDLE);
@@ -675,8 +674,6 @@ void SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
return;
}
- if(DBGetContactSettingByte(hContact, szGPGModuleName, "bViaAutoExchange", 0))
- DBWriteContactSettingByte(hContact, szGPGModuleName, "bAlwaysTrust", 1);
if(!bJabberAPI || !bIsMiranda09) //force jabber to handle encrypted message by itself
cmd += _T("--comment \"\" --no-version ");
if(DBGetContactSettingByte(hContact, szGPGModuleName, "bAlwaysTrust", 0))