summaryrefslogtreecommitdiff
path: root/plugins/New_GPG/src/metacontacts.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/New_GPG/src/metacontacts.cpp')
-rw-r--r--plugins/New_GPG/src/metacontacts.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/plugins/New_GPG/src/metacontacts.cpp b/plugins/New_GPG/src/metacontacts.cpp
index ab3c60bce5..b466cc65f0 100644
--- a/plugins/New_GPG/src/metacontacts.cpp
+++ b/plugins/New_GPG/src/metacontacts.cpp
@@ -29,16 +29,13 @@ bool metaIsProtoMetaContacts(HANDLE hContact)
return false;
}
-
bool metaIsDefaultSubContact(HANDLE hContact)
{
-
if(bMetaContacts)
return (HANDLE)CallService(MS_MC_GETDEFAULTCONTACT,(WPARAM)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0),0)==hContact;
return false;
}
-
HANDLE metaGetContact(HANDLE hContact)
{
if(bMetaContacts)
@@ -46,14 +43,14 @@ HANDLE metaGetContact(HANDLE hContact)
return (HANDLE)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0);
return NULL;
}
+
bool metaIsSubcontact(HANDLE hContact)
{
if(bMetaContacts)
- return (HANDLE)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0);
+ return CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0) != 0;
return false;
}
-
HANDLE metaGetMostOnline(HANDLE hContact)
{
@@ -62,6 +59,7 @@ HANDLE metaGetMostOnline(HANDLE hContact)
return (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT,(WPARAM)hContact,0);
return NULL;
}
+
HANDLE metaGetDefault(HANDLE hContact)
{
@@ -71,13 +69,13 @@ HANDLE metaGetDefault(HANDLE hContact)
return NULL;
}
-
DWORD metaGetContactsNum(HANDLE hContact)
{
if(bMetaContacts)
return CallService(MS_MC_GETNUMCONTACTS, (WPARAM)hContact, 0);
return 0;
}
+
HANDLE metaGetSubcontact(HANDLE hContact, int num)
{
if(bMetaContacts)