Merge branch 'new_gpg' into new_gpg_autoexchange

Conflicts:
	messages.cpp

1 files changed, 7 insertions, 3 deletions

diff --git a/icons.cpp b/icons.cpp
index cd32911..882f58b 100644
--- a/icons.cpp
+++ b/icons.cpp
@@ -82,7 +82,9 @@ void setClistIcon(HANDLE hContact)
 	bool enabled = isContactSecured(hContact);

 	extern HANDLE g_hCLIcon;

 	HANDLE hMC = hContact;

-	if(metaIsProtoMetaContacts(hContact))

+	if(metaIsSubcontact(hContact))

+		hMC = metaGetContact(hContact);

+	else if(metaIsProtoMetaContacts(hContact))

 		hMC = metaGetContact(hContact);

 	if(g_hCLIcon && enabled)

 	{

@@ -107,10 +109,12 @@ void setSrmmIcon(HANDLE hContact)
 	hContact = metaGetMostOnline(hContact);

 	bool enabled = isContactSecured(hContact);	

 	HANDLE hMC = hContact;

-	if(metaIsProtoMetaContacts(hContact))

+	if(metaIsSubcontact(hContact))

+		hMC = metaGetContact(hContact);

+	else if(metaIsProtoMetaContacts(hContact))

 		hMC = metaGetContact(hContact);

 	if(ServiceExists(MS_MSG_MODIFYICON))

-	{  // обновить иконки в srmm

+	{

 		StatusIconData sid = {0};

 		sid.cbSize = sizeof(sid);

 		sid.szModule = szGPGModuleName;