Merge branch 'new_gpg' into new_gpg_autoexchangenew_gpg_autoexchange

Conflicts:
	main.cpp
	messages.cpp

1 files changed, 4 insertions, 4 deletions

diff --git a/metacontacts.cpp b/metacontacts.cpp
index 46185e4..1abc2aa 100644..100755
--- a/metacontacts.cpp
+++ b/metacontacts.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

@@ -44,7 +44,7 @@ HANDLE metaGetContact(HANDLE hContact)
     if(bMetaContacts)

 		if(metaIsSubcontact(hContact))

 			return (HANDLE)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0);

-    return hContact;

+    return NULL;

 }

 bool metaIsSubcontact(HANDLE hContact)

 {

@@ -60,7 +60,7 @@ HANDLE metaGetMostOnline(HANDLE hContact)
     if(bMetaContacts)

 		if(metaIsProtoMetaContacts(hContact))

 			return (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT,(WPARAM)hContact,0);

-    return hContact;

+    return NULL;

 }

 HANDLE metaGetDefault(HANDLE hContact) 

 {

@@ -68,7 +68,7 @@ HANDLE metaGetDefault(HANDLE hContact)
     if(bMetaContacts)

 		if(metaIsProtoMetaContacts(hContact))

 			return (HANDLE)CallService(MS_MC_GETDEFAULTCONTACT,(WPARAM)hContact,0);

-    return hContact;

+    return NULL;

 }