Merge branch 'new_gpg' into new_gpg_autoexchange

Conflicts:
	messages.cpp

1 files changed, 8 insertions, 4 deletions

diff --git a/icons.cpp b/icons.cpp
index 1f4d353..cd32911 100644
--- a/icons.cpp
+++ b/icons.cpp
@@ -81,9 +81,11 @@ void setClistIcon(HANDLE hContact)
 {

 	bool enabled = isContactSecured(hContact);

 	extern HANDLE g_hCLIcon;

-	HANDLE hMC = metaGetContact(hContact);

+	HANDLE hMC = hContact;

+	if(metaIsProtoMetaContacts(hContact))

+		hMC = metaGetContact(hContact);

 	if(g_hCLIcon && enabled)

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

+	{

 		HICON icon = IconLibGetIcon("secured");

 		IconExtraColumn iec = {0};

 		iec.cbSize = sizeof(iec);

@@ -102,9 +104,11 @@ void setClistIcon(HANDLE hContact)
 

 void setSrmmIcon(HANDLE hContact)

 {

-	hContact = metaGetCurrent(hContact);

+	hContact = metaGetMostOnline(hContact);

 	bool enabled = isContactSecured(hContact);	

-	HANDLE hMC = metaGetContact(hContact);

+	HANDLE hMC = hContact;

+	if(metaIsProtoMetaContacts(hContact))

+		hMC = metaGetContact(hContact);

 	if(ServiceExists(MS_MSG_MODIFYICON))

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

 		StatusIconData sid = {0};