summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/SkypeClassic/src/skype.cpp6
-rw-r--r--protocols/SkypeClassic/src/skype.h1
2 files changed, 3 insertions, 4 deletions
diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp
index 2f464287cd..2880f4102a 100644
--- a/protocols/SkypeClassic/src/skype.cpp
+++ b/protocols/SkypeClassic/src/skype.cpp
@@ -1306,13 +1306,11 @@ void FetchMessageThread(fetchmsg_arg *pargs) {
// really bad on importing history for example, as all messages would be added with current
// timestamp. This would cause unreliable jumbled timestamps in metacontact, so we better do this
// ourself.
- if (db_get_b(hContact, "MetaContacts", "IsSubcontact", 0))
- {
+ if (db_mc_isSub(hContact)) {
DWORD dwMetaLink = db_get_dw(hContact, "MetaContacts", "MetaLink", MAXDWORD);
MCONTACT hMetaContact;
- if (dwMetaLink != MAXDWORD && (hMetaContact = GetMetaHandle(dwMetaLink)))
- {
+ if (dwMetaLink != MAXDWORD && (hMetaContact = GetMetaHandle(dwMetaLink))) {
dbei.szModule=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hMetaContact, 0);
pme->hMetaEvent = db_event_add(hMetaContact, &dbei);
}
diff --git a/protocols/SkypeClassic/src/skype.h b/protocols/SkypeClassic/src/skype.h
index 5cd87986dd..a07ce410f1 100644
--- a/protocols/SkypeClassic/src/skype.h
+++ b/protocols/SkypeClassic/src/skype.h
@@ -42,6 +42,7 @@
#include <m_userinfo.h>
#include <m_avatars.h>
#include <m_contacts.h>
+#include <m_metacontacts.h>
#include <m_popup.h>
#pragma warning (pop)