diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-27 21:51:46 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-27 21:51:46 +0000 |
| commit | 1fb0cd07fba1e8d6f9ac2ebe3b4f2e1c60acb81b (patch) | |
| tree | 904c95b33e03e806aea734552281257768273a14 /plugins/TabSRMM/src/contactcache.cpp | |
| parent | a8e8aebfd4f53977873c72c2d828c2c1f505f10d (diff) | |
- metacontacts are always present;
- added META_PROTO constant for mc module name;
- MS_MC_GETPROTOCOLNAME removed, because it always returns META_PROTO
git-svn-id: http://svn.miranda-ng.org/main/trunk@8319 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/contactcache.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/contactcache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp index 9076fe0499..2f9451f2ec 100644 --- a/plugins/TabSRMM/src/contactcache.cpp +++ b/plugins/TabSRMM/src/contactcache.cpp @@ -72,7 +72,7 @@ void CContactCache::initPhaseTwo() m_Valid = (m_szProto != 0 && m_szAccount != 0) ? true : false;
if (m_Valid) {
- m_isMeta = PluginConfig.bMetaEnabled && !strcmp(m_szProto, PluginConfig.szMetaName);
+ m_isMeta = PluginConfig.bMetaEnabled && !strcmp(m_szProto, META_PROTO);
m_isSubcontact = db_mc_isSub(m_hContact) != 0;
if (m_isMeta)
updateMeta(true);
@@ -531,7 +531,7 @@ CContactCache* CContactCache::getContactCache(MCONTACT hContact) */
void CContactCache::cacheUpdateMetaChanged()
{
- bool fMetaActive = (PluginConfig.g_MetaContactsAvail && PluginConfig.bMetaEnabled) ? true : false;
+ bool fMetaActive = (PluginConfig.bMetaEnabled) ? true : false;
for (int i=0; i < arContacts.getCount(); i++) {
CContactCache &c = arContacts[i];
@@ -547,7 +547,7 @@ void CContactCache::cacheUpdateMetaChanged() // reset meta contact information, if metacontacts protocol became avail
- if (fMetaActive && !strcmp(c.getProto(), PluginConfig.szMetaName))
+ if (fMetaActive && !strcmp(c.getProto(), META_PROTO))
c.resetMeta();
}
}
|