summaryrefslogtreecommitdiff
path: root/libpurple/protocols/jabber/disco.c
diff options
context:
space:
mode:
authorMarcus Lundblad <malu@pidgin.im>2010-04-09 22:14:51 +0000
committerMarcus Lundblad <malu@pidgin.im>2010-04-09 22:14:51 +0000
commit24f0a2f2edff9c48f57dd3607ad17b709470a1ff (patch)
tree6b54b7e275bd39b7e19888807fdfecb4e92dc972 /libpurple/protocols/jabber/disco.c
parent66e7384ffe7302c4a4689c662f5e43ad2772896f (diff)
parent1bfeea55ecc8c9f1b4ce9b5525d0db4b8b9216d5 (diff)
downloadpidgin-24f0a2f2edff9c48f57dd3607ad17b709470a1ff.tar.gz
propagate from branch 'im.pidgin.pidgin' (head 6eb46e96ade8acccef858c2bc7f6e4a4e0a1165b)
to branch 'im.pidgin.cpw.malu.xmpp.google_refactor' (head 2ca9f271ed5abe02634951a88d3222979c187e22)
Diffstat (limited to 'libpurple/protocols/jabber/disco.c')
-rw-r--r--libpurple/protocols/jabber/disco.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libpurple/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c
index 8a3ae80bcb..03ef6f02df 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"