From 01d131efd5d40016f07d51c0a0e9451204aa6dc8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 21 Sep 2013 17:21:32 +0000 Subject: "two for the price of one" variables' schema removed git-svn-id: http://svn.miranda-ng.org/main/trunk@6163 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_list.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'protocols/JabberG/src/jabber_list.h') diff --git a/protocols/JabberG/src/jabber_list.h b/protocols/JabberG/src/jabber_list.h index 38f22a79ef..08c82bbc1b 100644 --- a/protocols/JabberG/src/jabber_list.h +++ b/protocols/JabberG/src/jabber_list.h @@ -67,12 +67,6 @@ typedef enum { // initial default to RSMODE_LASTSEEN RSMODE_MANUAL // specify resource manually (see the defaultResource field - must not be NULL) } JABBER_RESOURCE_MODE; - -struct JABBER_XEP0232_SOFTWARE_INFO : public MZeroedObject -{ - ptrT tszOs, tszOsVersion, tszSoftware, tszSoftwareVersion, tszXMirandaCoreVersion; -}; - class JABBER_RESOURCE_STATUS : public MZeroedObject { LONG m_refCount; @@ -100,17 +94,17 @@ public: ptrT m_tszCapsNode; ptrT m_tszCapsVer; ptrT m_tszCapsExt; - ptrT m_tszSoftware; - ptrT m_tszVersion; - ptrT m_tszSystem; DWORD m_dwVersionRequestTime, m_dwDiscoInfoRequestTime; + JabberCapsBits m_jcbCachedCaps; JabberCapsBits m_jcbManualDiscoveredCaps; + // XEP-232 support + ptrT m_tszOs, m_tszOsVersion; + ptrT m_tszSoftware, m_tszSoftwareVersion, m_tszXMirandaCoreVersion; + // XEP-0085 gone event support BOOL m_bMessageSessionActive; - - JABBER_XEP0232_SOFTWARE_INFO *m_pSoftwareInfo; }; class pResourceStatus -- cgit v1.2.3