Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/disco.c @ 31449:1c660ba17ba1
propagate from branch 'im.pidgin.pidgin' (head 6f879669a6513a5c40335bbaefe842389a92b39e)
to branch 'im.pidgin.cpw.qulogic.cairo' (head 4ab0199887f74442673fd46dcbb662bc7f070bc4)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 21 Nov 2010 20:30:12 +0000 |
parents | 3b6106598b13 |
children | a8cc50c2279f |
comparison
equal
deleted
inserted
replaced
31448:9a705087d64e | 31449:1c660ba17ba1 |
---|---|
28 #include "request.h" | 28 #include "request.h" |
29 | 29 |
30 #include "adhoccommands.h" | 30 #include "adhoccommands.h" |
31 #include "buddy.h" | 31 #include "buddy.h" |
32 #include "disco.h" | 32 #include "disco.h" |
33 #include "google.h" | 33 #include "google/google.h" |
34 #include "google/gmail.h" | |
35 #include "google/jingleinfo.h" | |
34 #include "iq.h" | 36 #include "iq.h" |
35 #include "jabber.h" | 37 #include "jabber.h" |
36 #include "jingle/jingle.h" | 38 #include "jingle/jingle.h" |
37 #include "pep.h" | 39 #include "pep.h" |
38 #include "presence.h" | 40 #include "presence.h" |
254 /* XXX: actually check for protocol/muc or gc-1.0 support */ | 256 /* XXX: actually check for protocol/muc or gc-1.0 support */ |
255 js->chat_servers = g_list_prepend(js->chat_servers, g_strdup(from)); | 257 js->chat_servers = g_list_prepend(js->chat_servers, g_strdup(from)); |
256 } else if(!strcmp(category, "directory") && !strcmp(type, "user")) { | 258 } else if(!strcmp(category, "directory") && !strcmp(type, "user")) { |
257 /* we found a JUD */ | 259 /* we found a JUD */ |
258 js->user_directories = g_list_prepend(js->user_directories, g_strdup(from)); | 260 js->user_directories = g_list_prepend(js->user_directories, g_strdup(from)); |
259 } else if(!strcmp(category, "proxy") && !strcmp(type, NS_BYTESTREAMS)) { | 261 } else if(!strcmp(category, "proxy") && !strcmp(type, "bytestreams")) { |
260 /* This is a bytestream proxy */ | 262 /* This is a bytestream proxy */ |
261 JabberIq *iq; | 263 JabberIq *iq; |
262 JabberBytestreamsStreamhost *sh; | 264 JabberBytestreamsStreamhost *sh; |
263 | 265 |
264 purple_debug_info("jabber", "Found bytestream proxy server: %s\n", from); | 266 purple_debug_info("jabber", "Found bytestream proxy server: %s\n", from); |
595 query = xmlnode_get_child(packet, "query"); | 597 query = xmlnode_get_child(packet, "query"); |
596 | 598 |
597 for(child = xmlnode_get_child(query, "item"); child; | 599 for(child = xmlnode_get_child(query, "item"); child; |
598 child = xmlnode_get_next_twin(child)) { | 600 child = xmlnode_get_next_twin(child)) { |
599 JabberIq *iq; | 601 JabberIq *iq; |
600 const char *jid, *node; | 602 const char *jid; |
601 | 603 |
602 if(!(jid = xmlnode_get_attrib(child, "jid"))) | 604 if(!(jid = xmlnode_get_attrib(child, "jid"))) |
603 continue; | 605 continue; |
604 | 606 |
605 /* we don't actually care about the specific nodes, | 607 /* we don't actually care about the specific nodes, |