comparison libpurple/protocols/jabber/disco.c @ 26529:1ecbda91458a

Fix merge: Move the Jingle features to jabber.c Maiku: Should these (specifically the voice and video) parts only be advertised if the core indicates the current UI supports each individually?

26528:882748e27f9d

				if (!feat->is_enabled || feat->is_enabled(js, feat->namespace)) {
					feature = xmlnode_new_child(query, "feature");
					xmlnode_set_attrib(feature, "var", feat->namespace);
				}	
			}
#ifdef USE_VV
		} else if (node && !strcmp(node, CAPS0115_NODE "#voice-v1")) {
			SUPPORT_FEATURE("http://www.google.com/xmpp/protocol/session");
			SUPPORT_FEATURE("http://www.google.com/xmpp/protocol/voice/v1");
			SUPPORT_FEATURE(JINGLE);
			SUPPORT_FEATURE(JINGLE_APP_RTP_SUPPORT_AUDIO);
			SUPPORT_FEATURE(JINGLE_APP_RTP_SUPPORT_VIDEO);
			SUPPORT_FEATURE(JINGLE_TRANSPORT_RAWUDP);
			SUPPORT_FEATURE(JINGLE_TRANSPORT_ICEUDP);
#endif
		} else {
			xmlnode *error, *inf;
				
			/* XXX: gross hack, implement jabber_iq_set_type or something */
			xmlnode_set_attrib(iq->node, "type", "error");

26529:1ecbda91458a

				if (!feat->is_enabled || feat->is_enabled(js, feat->namespace)) {
					feature = xmlnode_new_child(query, "feature");
					xmlnode_set_attrib(feature, "var", feat->namespace);
				}	
			}
		} else {
			xmlnode *error, *inf;
				
			/* XXX: gross hack, implement jabber_iq_set_type or something */
			xmlnode_set_attrib(iq->node, "type", "error");