From e0db8851abe880553f48a0b2454dde293ffb22b2 Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss@sss.chaoslab.ru>
Date: Mon, 2 Jul 2012 23:26:17 +0300
Subject: =?UTF-8?q?added=20ability=20to=20set=20private=20key=20for=20each?=
 =?UTF-8?q?=20protocol=20(#50=20=09=D0=A1=D0=B2=D0=BE=D0=B9=20=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=B0=D0=B6=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B9=20=D1=83=D1=87=D0=B5=D1=82=D0=BD=D0=BE=D0=B9=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utilities.cpp | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

(limited to 'utilities.cpp')

diff --git a/utilities.cpp b/utilities.cpp
index 6b2261d..2207213 100755
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -195,8 +195,23 @@ int SendKey(WPARAM w, LPARAM l)
 	HANDLE hContact = (HANDLE)w;
 	if(metaIsProtoMetaContacts(hContact))
 		hContact = metaGetMostOnline(hContact);
-	char *szMessage = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
-	if(strlen(szMessage) > 1)
+	char *szMessage;
+	{
+		char *proto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+		char setting[64];
+		if(proto)
+		{
+			strcpy(setting, proto);
+			strcat(setting, "_GPGPubKey");
+			szMessage = UniGetContactSettingUtf(NULL, szGPGModuleName, setting, "");
+		}
+		if(!szMessage[0])
+		{
+			mir_free(szMessage);
+			szMessage = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
+		}
+	}
+	if(szMessage[0])
 	{
 		BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
 		DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
@@ -746,7 +761,19 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pU
 					DWORD code;
 					wstring cmd;
 					{
-						char *inkeyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
+						char *inkeyid;
+						{
+							char *proto = ji->Sys()->GetModuleName();
+							char setting[64];
+							strcpy(setting, proto);
+							strcat(setting, "_KeyID");
+							inkeyid = UniGetContactSettingUtf(NULL, szGPGModuleName, setting, "");
+							if(!inkeyid[0])
+							{
+								mir_free(inkeyid);
+								inkeyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
+							}
+						}
 						TCHAR *pass = NULL;
 						if(inkeyid[0])
 						{
-- 
cgit v1.2.3