diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-27 20:50:07 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-27 20:50:07 +0000 |
| commit | 13c033c257f6c083b0c46b4fa28601db5a0b6335 (patch) | |
| tree | cb6c2d292df718d1cddd885ad1029a0b81f1b7e4 /protocols | |
| parent | 367e673a5a3d4d49b2ef1bfbf57a1a5828a2d174 (diff) | |
MS_MC_GETMETACONTACT => db_mc_getMeta
git-svn-id: http://svn.miranda-ng.org/main/trunk@8317 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/MSN/src/msn_misc.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeClassic/src/skype.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index 18a652801f..d370429c57 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -1222,7 +1222,7 @@ bool MSN_MsgWndExist(MCONTACT hContact) bool res = CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&msgWinInData, (LPARAM)&msgWinData) != 0;
res = res || msgWinData.hwndWindow;
if (res) {
- msgWinInData.hContact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, hContact, 0);
+ msgWinInData.hContact = db_mc_getMeta(hContact);
if (msgWinInData.hContact != NULL) {
res = CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&msgWinInData, (LPARAM)&msgWinData) != 0;
res |= (msgWinData.hwndWindow == NULL);
diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp index 2880f4102a..3cc41e1113 100644 --- a/protocols/SkypeClassic/src/skype.cpp +++ b/protocols/SkypeClassic/src/skype.cpp @@ -1443,8 +1443,8 @@ MCONTACT GetCallerContact(char *szSkypeMsg) MCONTACT GetMetaHandle(DWORD dwId)
{
for (MCONTACT hContact=db_find_first(); hContact != NULL; hContact=db_find_next(hContact)) {
- char *szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, hContact, 0 );
- if (szProto!=NULL && !strcmp(szProto, "MetaContacts") &&
+ char *szProto = GetContactProto(hContact);
+ if (szProto != NULL && !strcmp(szProto, "MetaContacts") &&
db_get_dw(hContact, "MetaContacts", "MetaID", MAXDWORD)==dwId)
return hContact;
}
|