git-svn-id: http://svn.miranda-ng.org/main/trunk@1236 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 1 insertions, 32 deletions

diff --git a/plugins/new_gpg/src/commonheaders.h b/plugins/new_gpg/src/commonheaders.h
index 459d76ef64..ea9f32cd32 100755
--- a/plugins/new_gpg/src/commonheaders.h
+++ b/plugins/new_gpg/src/commonheaders.h
@@ -67,7 +67,6 @@ using std::fstream;
 #include <m_protosvc.h>
 #include <m_netlib.h>
 #include <m_jabber.h>
-#include <m_icqplus.h>
 #include <m_message.h>
 #include <m_cluiframes.h>
 #include <m_icolib.h>
diff --git a/plugins/new_gpg/src/main.cpp b/plugins/new_gpg/src/main.cpp
index 3857f38438..6b80bc2b8a 100755
--- a/plugins/new_gpg/src/main.cpp
+++ b/plugins/new_gpg/src/main.cpp
@@ -2022,16 +2022,6 @@ void InitCheck()
 		}
 		mir_free(path);
 	}
-	extern bool bAutoExchange;
-	if(bAutoExchange && (ServiceExists("ICQ"PS_ICQ_ADDCAPABILITY))) //work only for one icq instance
-	{
-		ICQ_CUSTOMCAP cap;
-		cap.cbSize = sizeof(ICQ_CUSTOMCAP);
-		cap.hIcon = 0;
-		strcpy(cap.name, "GPG Key AutoExchange");
-		strcpy(cap.caps, "GPG AutoExchange");
-		CallService("ICQ"PS_ICQ_ADDCAPABILITY, 0, (LPARAM)&cap);
-	}
 }
 
 void ImportKey()
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')