From d04cdda0da5f081ccff10acc8670ee1ce37fca36 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 2 Aug 2013 19:49:08 +0000 Subject: obsoleted information removed from Jabber git-svn-id: http://svn.miranda-ng.org/main/trunk@5555 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_caps.cpp | 13 ------------- protocols/JabberG/src/jabber_list.h | 3 --- protocols/JabberG/src/jabber_userinfo.cpp | 6 +----- 3 files changed, 1 insertion(+), 21 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp index 46210b8fb8..4f7e1615a3 100644 --- a/protocols/JabberG/src/jabber_caps.cpp +++ b/protocols/JabberG/src/jabber_caps.cpp @@ -129,19 +129,6 @@ void CJabberProto::OnIqResultCapsDiscoInfoSI(HXML, CJabberIqInfo* pInfo) szTmp = XPath(xform, _T("field[@var='x-miranda-core-version']/value")); if (szTmp) r->pSoftwareInfo->tszXMirandaCoreVersion = mir_tstrdup(szTmp); - szTmp = XPath(xform, _T("field[@var='x-miranda-core-is-unicode']/value")); - if ( !szTmp) // old deprecated format - szTmp = XPath(xform, _T("field[@var='x-miranda-is-unicode']/value")); - if (szTmp && _ttoi(szTmp)) - r->pSoftwareInfo->bXMirandaIsUnicode = TRUE; - szTmp = XPath(xform, _T("field[@var='x-miranda-core-is-alpha']/value")); - if ( !szTmp) // old deprecated format - szTmp = XPath(xform, _T("field[@var='x-miranda-is-alpha']/value")); - if (szTmp && _ttoi(szTmp)) - r->pSoftwareInfo->bXMirandaIsAlpha = TRUE; - szTmp = XPath(xform, _T("field[@var='x-miranda-jabber-is-debug']/value")); - if (szTmp && _ttoi(szTmp)) - r->pSoftwareInfo->bXMirandaIsDebug = TRUE; } JabberUserInfoUpdate(pInfo->GetHContact()); } diff --git a/protocols/JabberG/src/jabber_list.h b/protocols/JabberG/src/jabber_list.h index 798d0603ae..2f8f5c4edb 100644 --- a/protocols/JabberG/src/jabber_list.h +++ b/protocols/JabberG/src/jabber_list.h @@ -71,9 +71,6 @@ typedef enum { // initial default to RSMODE_LASTSEEN struct JABBER_XEP0232_SOFTWARE_INFO : public MZeroedObject { ptrT tszOs, tszOsVersion, tszSoftware, tszSoftwareVersion, tszXMirandaCoreVersion; - BOOL bXMirandaIsUnicode; - BOOL bXMirandaIsAlpha; - BOOL bXMirandaIsDebug; }; struct JABBER_RESOURCE_STATUS diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp index 33b2e82dbd..eddc3c11ed 100644 --- a/protocols/JabberG/src/jabber_userinfo.cpp +++ b/protocols/JabberG/src/jabber_userinfo.cpp @@ -307,12 +307,8 @@ static void sttFillResourceInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM hti sttFillInfoLine(hwndTree, htiSoftwareInfo, NULL, TranslateT("Software"), p->tszSoftware, sttInfoLineId(resource, INFOLINE_SOFTWARE_INFORMATION, nLineId++)); if (p->tszSoftwareVersion) sttFillInfoLine(hwndTree, htiSoftwareInfo, NULL, TranslateT("Software version"), p->tszSoftwareVersion, sttInfoLineId(resource, INFOLINE_SOFTWARE_INFORMATION, nLineId++)); - if (p->tszXMirandaCoreVersion) { + if (p->tszXMirandaCoreVersion) sttFillInfoLine(hwndTree, htiSoftwareInfo, NULL, TranslateT("Miranda NG core version"), p->tszXMirandaCoreVersion, sttInfoLineId(resource, INFOLINE_SOFTWARE_INFORMATION, nLineId++)); - sttFillInfoLine(hwndTree, htiSoftwareInfo, NULL, TranslateT("Unicode build"), p->bXMirandaIsUnicode ? TranslateT("Yes") : TranslateT("No"), sttInfoLineId(resource, INFOLINE_SOFTWARE_INFORMATION, nLineId++)); - sttFillInfoLine(hwndTree, htiSoftwareInfo, NULL, TranslateT("Alpha build"), p->bXMirandaIsAlpha ? TranslateT("Yes") : TranslateT("No"), sttInfoLineId(resource, INFOLINE_SOFTWARE_INFORMATION, nLineId++)); - sttFillInfoLine(hwndTree, htiSoftwareInfo, NULL, TranslateT("Debug build"), p->bXMirandaIsDebug ? TranslateT("Yes") : TranslateT("No"), sttInfoLineId(resource, INFOLINE_SOFTWARE_INFORMATION, nLineId++)); - } } } -- cgit v1.2.3