summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-06-22 17:59:09 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-06-22 17:59:09 +0000
commit9a861161c1fc6efa2145430991f75804fb5fd540 (patch)
treea4b9330192a4b60418c653a3bbbc7e5a99ddecb3 /plugins
parent409d7264947ae132f6185cf5c6d1e4d3ff626f80 (diff)
message sending fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@9554 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
-rw-r--r--plugins/TabSRMM/src/contactcache.cpp6
-rw-r--r--plugins/TabSRMM/src/mim.cpp2
2 files changed, 3 insertions, 5 deletions
diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp
index e34eb7b821..a9d817c2e2 100644
--- a/plugins/TabSRMM/src/contactcache.cpp
+++ b/plugins/TabSRMM/src/contactcache.cpp
@@ -150,7 +150,7 @@ bool CContactCache::updateStatus()
*/
void CContactCache::updateMeta(bool fForce)
{
- m_szMetaProto = (m_Valid) ? GetContactProto(db_mc_getMostOnline(cc->contactID)) : NULL;
+ m_szMetaProto = (m_Valid) ? GetContactProto(db_mc_getSrmmSub(cc->contactID)) : NULL;
}
/**
@@ -602,7 +602,5 @@ int CContactCache::getMaxMessageLength()
const MCONTACT CContactCache::getActiveContact() const
{
- if (!m_isMeta)
- return m_hContact;
- return CallService(MS_MC_GETSRMMSUB, m_hContact, 0);
+ return (m_isMeta) ? m_hContact : db_mc_getSrmmSub(m_hContact);
}
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 21e412c172..218fc6031b 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -592,7 +592,7 @@ int CMimAPI::MessageEventAdded(WPARAM hContact, LPARAM lParam)
else {
char *szProto = GetContactProto(hContact);
if (szProto && !strcmp(szProto, META_PROTO))
- szProto = GetContactProto(db_mc_getMostOnline(hContact));
+ szProto = GetContactProto(db_mc_getSrmmSub(hContact));
if (szProto) {
DWORD dwStatus = (DWORD)CallProtoService(szProto, PS_GETSTATUS, 0, 0);