diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-09-28 21:05:24 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-09-28 21:05:24 +0000 |
| commit | 2954dbdabf126bcfaf956de5ac3d28adb8940c1b (patch) | |
| tree | 333e3909c63e08a1ca6270a4a46c79c1de0061b0 /protocols/JabberG/src/jabber_iqid.cpp | |
| parent | 8f0577ab8e8c06fdefd347b9485cb0c212e221e6 (diff) | |
no more google related code in Jabber
git-svn-id: http://svn.miranda-ng.org/main/trunk@6264 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_iqid.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid.cpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index f226f5b7af..5ef126bcbd 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -43,26 +43,20 @@ void CJabberProto::OnIqResultServerDiscoInfo(HXML iqNode) HXML identity;
for (int i = 1; (identity = xmlGetNthChild(query, _T("identity"), i)) != NULL; i++) {
- const TCHAR *identityCategory = xmlGetAttrValue(identity, _T("category"));
- const TCHAR *identityType = xmlGetAttrValue(identity, _T("type"));
- const TCHAR *identityName = xmlGetAttrValue(identity, _T("name"));
- if (identityCategory && identityType && !_tcscmp(identityCategory, _T("pubsub")) && !_tcscmp(identityType, _T("pep"))) {
+ JABBER_DISCO_FIELD tmp = {
+ xmlGetAttrValue(identity, _T("category")),
+ xmlGetAttrValue(identity, _T("type")),
+ xmlGetAttrValue(identity, _T("name")) };
+
+ if ( !lstrcmp(tmp.category, _T("pubsub")) && !lstrcmp(tmp.type, _T("pep"))) {
m_bPepSupported = TRUE;
EnableMenuItems(TRUE);
RebuildInfoFrame();
+ continue;
}
- else if (identityCategory && identityType && identityName &&
- !_tcscmp(identityCategory, _T("server")) &&
- !_tcscmp(identityType, _T("im")) &&
- !_tcscmp(identityName, _T("Google Talk"))) {
- m_ThreadInfo->jabberServerCaps |= JABBER_CAPS_PING;
-
- // Google Shared Status
- m_ThreadInfo->send(
- XmlNodeIq(m_iqManager.AddHandler(&CJabberProto::OnIqResultGoogleSharedStatus, JABBER_IQ_TYPE_GET))
- << XQUERY(JABBER_FEAT_GTALK_SHARED_STATUS) << XATTR(_T("version"), _T("2")));
- }
+
+ NotifyFastHook(hDiscoInfoResult, (WPARAM)&tmp, (LPARAM)(IJabberInterface*)this);
}
if (m_ThreadInfo) {
|