- unused parameter removed;

- function updateMeta() made more intellectual: if the sub's change detected, it'd renew all dependent info

git-svn-id: http://svn.miranda-ng.org/main/trunk@10022 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 3 insertions, 3 deletions

diff --git a/plugins/TabSRMM/src/contactcache.h b/plugins/TabSRMM/src/contactcache.h
index d38a622d6c..746bfb05df 100644
--- a/plugins/TabSRMM/src/contactcache.h
+++ b/plugins/TabSRMM/src/contactcache.h
@@ -77,7 +77,7 @@ struct CContactCache : public MZeroedObject
 	const WORD     getOldStatus() const { return m_wOldStatus; }

 	const TCHAR*   getNick() const { return m_szNick; }

 	const MCONTACT getContact() const { return m_hContact; }

-	const MCONTACT getActiveContact() const;

+	const MCONTACT getActiveContact() const { return (m_isMeta) ? m_hSub : m_hContact; }

 	const DWORD    getIdleTS() const { return m_idleTS; }

 	const char*    getProto() const { return cc->szProto; }

 	const char*    getActiveProto() const { return m_isMeta ? (m_szMetaProto ? m_szMetaProto : cc->szProto) : cc->szProto; }

@@ -106,7 +106,7 @@ struct CContactCache : public MZeroedObject
 	void   updateState();

 	bool   updateStatus();

 	bool   updateNick();

-	void   updateMeta(bool fForce = false);

+	void   updateMeta();

 	bool   updateUIN();

 	void   updateStatusMsg(const char *szKey = 0);

 	void   setWindowData(const HWND hwnd = 0, TWindowData *dat = 0);

@@ -132,7 +132,7 @@ private:
 	void   allocHistory();

 	void   releaseAlloced();

 

-	MCONTACT m_hContact;

+	MCONTACT m_hContact, m_hSub;

 	WORD     m_wStatus, m_wOldStatus, m_wMetaStatus;

 	char    *m_szMetaProto;

 	TCHAR   *m_szAccount;