summaryrefslogtreecommitdiff
path: root/plugins/new_gpg/src/messages.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-07-28 22:14:27 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-07-28 22:14:27 +0000
commit6a47964cab12d66c30a106b77a59263e615c1213 (patch)
treeb0b0dbdb66176280cb0f26420e9848c281fe585e /plugins/new_gpg/src/messages.cpp
parentf20c43580461fb0f63a0e726597ba8154334e617 (diff)
git-svn-id: http://svn.miranda-ng.org/main/trunk@1236 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/new_gpg/src/messages.cpp')
-rwxr-xr-xplugins/new_gpg/src/messages.cpp22
1 files changed, 1 insertions, 21 deletions
diff --git a/plugins/new_gpg/src/messages.cpp b/plugins/new_gpg/src/messages.cpp
index f2e3c3527c..8ac0186466 100755
--- a/plugins/new_gpg/src/messages.cpp
+++ b/plugins/new_gpg/src/messages.cpp
@@ -567,13 +567,6 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
DWORD uin = DBGetContactSettingDword(ccs->hContact, proto, "UIN", 0);
if(uin)
{
- if(ServiceExists("ICQ"PS_ICQ_CHECKCAPABILITY))
- {
- ICQ_CUSTOMCAP cap = {0};
- strcpy(cap.caps, "GPG AutoExchange");
- if(CallService("ICQ"PS_ICQ_CHECKCAPABILITY, (WPARAM)ccs->hContact, (LPARAM)&cap))
- CallContactService(ccs->hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)"-----PGP KEY REQUEST-----");
- }
}
else
{
@@ -827,19 +820,6 @@ int SendMsgSvc(WPARAM w, LPARAM l)
DWORD uin = DBGetContactSettingDword(ccs->hContact, proto, "UIN", 0);
if(uin)
{
- if(ServiceExists("ICQ"PS_ICQ_CHECKCAPABILITY))
- {
- ICQ_CUSTOMCAP cap = {0};
- strcpy(cap.caps, "GPG AutoExchange");
- if(CallService("ICQ"PS_ICQ_CHECKCAPABILITY, (WPARAM)ccs->hContact, (LPARAM)&cap))
- {
- CallContactService(ccs->hContact, PSS_MESSAGE, (WPARAM)ccs->wParam, (LPARAM)"-----PGP KEY REQUEST-----");
- hcontact_data[ccs->hContact].msgs_to_send.push_back(msg);
- boost::thread *thr = new boost::thread(boost::bind(send_encrypted_msgs_thread, ccs->hContact));
- mir_free(msg);
- return returnNoError(ccs->hContact);
- }
- }
}
else
{
@@ -854,7 +834,7 @@ int SendMsgSvc(WPARAM w, LPARAM l)
if(caps)
{
wstring str;
- for(int i =0;;i++)
+ for(int i=0;;i++)
{
str.push_back(caps[i]);
if(caps[i] == '\0')