Mercurial > pidgin
comparison libpurple/protocols/jabber/disco.c @ 23769:60f5abc6cf0c
propagate from branch 'im.pidgin.pidgin' (head 7f8e027e1591ade622baf58a9dac216e7122c1ac)
to branch 'im.pidgin.pidgin.vv' (head 9fd950ff4de5331c13cd762cb755741046bdd576)
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Sat, 29 Dec 2007 06:34:59 +0000 |
parents | a4b6854737d5 315151da0dc6 |
children | 92e71f6e10d4 |
comparison
equal
deleted
inserted
replaced
21949:18628d7aba30 | 23769:60f5abc6cf0c |
---|---|
140 JabberFeature *feat = (JabberFeature*)features->data; | 140 JabberFeature *feat = (JabberFeature*)features->data; |
141 if(feat->is_enabled == NULL || feat->is_enabled(js, feat->shortname, feat->namespace) == TRUE) | 141 if(feat->is_enabled == NULL || feat->is_enabled(js, feat->shortname, feat->namespace) == TRUE) |
142 SUPPORT_FEATURE(feat->namespace); | 142 SUPPORT_FEATURE(feat->namespace); |
143 } | 143 } |
144 } | 144 } |
145 } else if (node && !strcmp(node, CAPS0115_NODE "#voice-v1")) { | |
146 SUPPORT_FEATURE("http://www.google.com/session"); | |
147 SUPPORT_FEATURE("http://www.google.com/transport/p2p"); | |
148 SUPPORT_FEATURE("http://www.google.com/transport/raw-udp"); | |
149 SUPPORT_FEATURE("http://www.google.com/session/phone"); | |
150 SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0166.html"); | |
151 SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0180.html"); | |
152 SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0167.html"); | |
153 SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0177.html"); | |
145 } else { | 154 } else { |
146 const char *ext = NULL; | 155 const char *ext = NULL; |
147 unsigned pos; | 156 unsigned pos; |
148 unsigned nodelen = strlen(node); | 157 unsigned nodelen = strlen(node); |
149 unsigned capslen = strlen(CAPS0115_NODE); | 158 unsigned capslen = strlen(CAPS0115_NODE); |