Merge branch 'new_gpg' into new_gpg_autoexchangenew_gpg_autoexchange

Conflicts:
	main.cpp
	messages.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/icons.cpp b/icons.cpp
index 882f58b..58a24c9 100644..100755
--- a/icons.cpp
+++ b/icons.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2010 SecureIM developers (baloo and others), sss

+// Copyright © 2010-2012 SecureIM developers (baloo and others), sss

 // 

 // This program is free software; you can redistribute it and/or

 // modify it under the terms of the GNU General Public License

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

 }

 

-void setSrmmIcon(HANDLE hContact)

+void setSrmmIcon(HANDLE h)

 {

-	hContact = metaGetMostOnline(hContact);

+	HANDLE hContact = metaIsProtoMetaContacts(h)?metaGetMostOnline(h):h;

 	bool enabled = isContactSecured(hContact);	

 	HANDLE hMC = hContact;

 	if(metaIsSubcontact(hContact))