Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/disco.c Sat Aug 21 06:04:13 2010 +0000 +++ b/libpurple/protocols/jabber/disco.c Sun Nov 21 20:30:12 2010 +0000 @@ -30,7 +30,9 @@ #include "adhoccommands.h" #include "buddy.h" #include "disco.h" -#include "google.h" +#include "google/google.h" +#include "google/gmail.h" +#include "google/jingleinfo.h" #include "iq.h" #include "jabber.h" #include "jingle/jingle.h" @@ -256,7 +258,7 @@ } else if(!strcmp(category, "directory") && !strcmp(type, "user")) { /* we found a JUD */ js->user_directories = g_list_prepend(js->user_directories, g_strdup(from)); - } else if(!strcmp(category, "proxy") && !strcmp(type, NS_BYTESTREAMS)) { + } else if(!strcmp(category, "proxy") && !strcmp(type, "bytestreams")) { /* This is a bytestream proxy */ JabberIq *iq; JabberBytestreamsStreamhost *sh; @@ -597,7 +599,7 @@ for(child = xmlnode_get_child(query, "item"); child; child = xmlnode_get_next_twin(child)) { JabberIq *iq; - const char *jid, *node; + const char *jid; if(!(jid = xmlnode_get_attrib(child, "jid"))) continue;