diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-27 19:17:59 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-27 19:17:59 +0000 |
| commit | ec35bbd307636ded865626eb13584e4ab0b9a4af (patch) | |
| tree | 24b68bfb7574a763ed5ebcfb56e5c6b86d047324 /protocols | |
| parent | 0800db775a4da41507478a02fa8cb9e58f35b0c9 (diff) | |
direct access to MetaContacts/IsSubcontact removed everywhere
git-svn-id: http://svn.miranda-ng.org/main/trunk@8312 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/SkypeClassic/src/skype.cpp | 6 | ||||
| -rw-r--r-- | protocols/SkypeClassic/src/skype.h | 1 |
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)
|