cpw.darkrain42.xmpp.iq-handlers: a0e14a71: Do not advertise support for old XEP-019...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: a0e14a71dc7095483850d6879d12a1ece864ef6a
Ancestor: 3cd4018e77e0ed680e9ff810136923604c31ecf0
Author: paul at darkrain42.org
Date: 2009-03-14T15:50:56
Branch: im.pidgin.cpw.darkrain42.xmpp.iq-handlers
URL: http://d.pidgin.im/viewmtn/revision/info/a0e14a71dc7095483850d6879d12a1ece864ef6a

Modified files:
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c

ChangeLog: 

Do not advertise support for old XEP-0199 (Ping) namespace

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/buddy.c	2725aa5f83203d5e70e9bf3a4ce437085ad0953f
+++ libpurple/protocols/jabber/buddy.c	647037cdb504584538d7ccf79680bdb3ade700b8
@@ -935,7 +935,7 @@ static void jabber_buddy_info_show_if_re
 					feature = _("User Gaming");
 				else if(!strcmp(feature, "http://jabber.org/protocol/viewing"))
 					feature = _("User Viewing");
-				else if(!strcmp(feature, "urn:xmpp:ping") || !strcmp(feature, "http://www.xmpp.org/extensions/xep-0199.html#ns"))
+				else if(!strcmp(feature, "urn:xmpp:ping"))
 					feature = _("Ping");
 				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0200.html#ns"))
 					feature = _("Stanza Encryption");
@@ -1121,7 +1121,7 @@ static void jabber_buddy_info_show_if_re
 						feature = _("User Gaming");
 					else if(!strcmp(feature, "http://jabber.org/protocol/viewing"))
 						feature = _("User Viewing");
-					else if(!strcmp(feature, "urn:xmpp:ping") || !strcmp(feature, "http://www.xmpp.org/extensions/xep-0199.html#ns"))
+					else if(!strcmp(feature, "urn:xmpp:ping"))
 						feature = _("Ping");
 					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0200.html#ns"))
 						feature = _("Stanza Encryption");
============================================================
--- libpurple/protocols/jabber/disco.c	a0abc31436b8422c61b37e08e471dc53971ca030
+++ libpurple/protocols/jabber/disco.c	32e1eea70d451af8bd966e53b017d9458a3e7077
@@ -134,7 +134,6 @@ void jabber_disco_info_parse(JabberStrea
 			SUPPORT_FEATURE("http://jabber.org/protocol/si/profile/file-transfer")
 			SUPPORT_FEATURE("http://jabber.org/protocol/xhtml-im")
 			SUPPORT_FEATURE("urn:xmpp:ping")
-			SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0199.html#ns")
 
 			if(!node) { /* non-caps disco#info, add all enabled extensions */
 				GList *features;
@@ -260,7 +259,7 @@ void jabber_disco_info_parse(JabberStrea
 					capabilities |= JABBER_CAP_IQ_SEARCH;
 				else if(!strcmp(var, "jabber:iq:register"))
 					capabilities |= JABBER_CAP_IQ_REGISTER;
-				else if(!strcmp(var, "http://www.xmpp.org/extensions/xep-0199.html#ns"))
+				else if(!strcmp(var, "urn:xmpp:ping"))
 					capabilities |= JABBER_CAP_PING;
 				else if(!strcmp(var, "http://jabber.org/protocol/commands")) {
 					capabilities |= JABBER_CAP_ADHOC;