diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-05-30 15:31:28 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-05-30 15:31:28 +0000 |
| commit | 581204a18bc5a50d1c8a7412e147e560503d11b8 (patch) | |
| tree | 59f78fa2cc227e4feae48c9cf4e10544c80c4c71 /plugins/SecureIM | |
| parent | fd0d38e50db088692bfff7608df3b765d804e847 (diff) | |
db_mc_getMostOnline - a handy helper for MS_MC_GETMOSTONLINECONTACT
git-svn-id: http://svn.miranda-ng.org/main/trunk@9372 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SecureIM')
| -rw-r--r-- | plugins/SecureIM/src/crypt.h | 1 | ||||
| -rw-r--r-- | plugins/SecureIM/src/crypt_check.cpp | 2 | ||||
| -rw-r--r-- | plugins/SecureIM/src/crypt_metacontacts.cpp | 5 | ||||
| -rw-r--r-- | plugins/SecureIM/src/svcs_clist.cpp | 4 | ||||
| -rw-r--r-- | plugins/SecureIM/src/svcs_srmm.cpp | 2 |
5 files changed, 4 insertions, 10 deletions
diff --git a/plugins/SecureIM/src/crypt.h b/plugins/SecureIM/src/crypt.h index 42bbe51f9b..7b68e027f5 100644 --- a/plugins/SecureIM/src/crypt.h +++ b/plugins/SecureIM/src/crypt.h @@ -146,7 +146,6 @@ void showPopupRM(MCONTACT); // crypt_meta.cpp
BOOL isProtoMetaContacts(MCONTACT);
BOOL isDefaultSubContact(MCONTACT);
-MCONTACT getMostOnline(MCONTACT);
void DeinitMetaContact(MCONTACT);
// crypt_dll.cpp
diff --git a/plugins/SecureIM/src/crypt_check.cpp b/plugins/SecureIM/src/crypt_check.cpp index 2359af5240..941e279220 100644 --- a/plugins/SecureIM/src/crypt_check.cpp +++ b/plugins/SecureIM/src/crypt_check.cpp @@ -24,7 +24,7 @@ BYTE isContactSecured(MCONTACT hContact) if (!arClist.getCount()) return 0;
if (isProtoMetaContacts(hContact))
- hContact = getMostOnline(hContact); // возьмем тот, через который пойдет сообщение
+ hContact = db_mc_getMostOnline(hContact); // возьмем тот, через который пойдет сообщение
pUinKey p = findUinKey(hContact);
if (!p || !p->proto || !p->proto->inspecting)
diff --git a/plugins/SecureIM/src/crypt_metacontacts.cpp b/plugins/SecureIM/src/crypt_metacontacts.cpp index ababa88f60..54d3ffd797 100644 --- a/plugins/SecureIM/src/crypt_metacontacts.cpp +++ b/plugins/SecureIM/src/crypt_metacontacts.cpp @@ -13,11 +13,6 @@ BOOL isDefaultSubContact(MCONTACT hContact) return db_mc_getDefault(db_mc_getMeta(hContact)) == hContact;
}
-MCONTACT getMostOnline(MCONTACT hContact)
-{
- return (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0);
-}
-
// remove all secureim connections on subcontacts
void DeinitMetaContact(MCONTACT hContact)
{
diff --git a/plugins/SecureIM/src/svcs_clist.cpp b/plugins/SecureIM/src/svcs_clist.cpp index a25f9f91f4..bb1f422cbe 100644 --- a/plugins/SecureIM/src/svcs_clist.cpp +++ b/plugins/SecureIM/src/svcs_clist.cpp @@ -67,7 +67,8 @@ int __cdecl onExtraImageApplying(WPARAM wParam, LPARAM) int __cdecl onRebuildContactMenu(WPARAM hContact,LPARAM lParam)
{
BOOL bMC = isProtoMetaContacts(hContact);
- if (bMC ) hContact = getMostOnline(hContact); // возьмем тот, через который пойдет сообщение
+ if (bMC)
+ hContact = db_mc_getMostOnline(hContact); // возьмем тот, через который пойдет сообщение
pUinKey ptr = getUinKey(hContact);
int i;
CLISTMENUITEM mi = { sizeof(mi) };
@@ -153,5 +154,4 @@ int __cdecl onRebuildContactMenu(WPARAM hContact,LPARAM lParam) return 0;
}
-
// EOF
diff --git a/plugins/SecureIM/src/svcs_srmm.cpp b/plugins/SecureIM/src/svcs_srmm.cpp index de0b384350..e9ba237a51 100644 --- a/plugins/SecureIM/src/svcs_srmm.cpp +++ b/plugins/SecureIM/src/svcs_srmm.cpp @@ -12,7 +12,7 @@ int __cdecl onWindowEvent(WPARAM, LPARAM lParam) int __cdecl onIconPressed(WPARAM hContact, LPARAM lParam)
{
if (isProtoMetaContacts(hContact))
- hContact = getMostOnline(hContact); // возьмем тот, через который пойдет сообщение
+ hContact = db_mc_getMostOnline(hContact); // возьмем тот, через который пойдет сообщение
StatusIconClickData *sicd = (StatusIconClickData *)lParam;
if (strcmp(sicd->szModule, MODULENAME) != 0 || !isSecureProtocol(hContact))
|