summaryrefslogtreecommitdiff
path: root/libpurple/protocols/jabber/disco.c
diff options
context:
space:
mode:
Diffstat (limited to 'libpurple/protocols/jabber/disco.c')
-rw-r--r--libpurple/protocols/jabber/disco.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libpurple/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c
index 6150c67db9..6692a11e04 100644
--- a/libpurple/protocols/jabber/disco.c
+++ b/libpurple/protocols/jabber/disco.c
@@ -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 @@ static void jabber_disco_info_cb(JabberStream *js, const char *from,
} 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 @@ jabber_disco_server_items_result_cb(JabberStream *js, const char *from,
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;