# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1241047431 0
# Node ID 58ff88dba33a6064450f1398077cadd29a0d9528
# Parent  413006df9828793e4344d9f614be5f7a5a0c6429
Fix merge.

diff -r 413006df9828 -r 58ff88dba33a libpurple/protocols/jabber/disco.c
--- a/libpurple/protocols/jabber/disco.c	Wed Apr 29 23:20:51 2009 +0000
+++ b/libpurple/protocols/jabber/disco.c	Wed Apr 29 23:23:51 2009 +0000
@@ -22,6 +22,7 @@
 #include "internal.h"
 #include "prefs.h"
 #include "debug.h"
+#include "request.h"
 
 #include "adhoccommands.h"
 #include "buddy.h"
@@ -226,7 +227,6 @@
 		JabberBuddy *jb;
 		JabberBuddyResource *jbr = NULL;
 		JabberCapabilities capabilities = JABBER_CAP_NONE;
-		struct _jabber_disco_info_cb_data *jdicd;
 
 		if((jid = jabber_id_new(from))) {
 			if(jid->resource && (jb = jabber_buddy_find(js, from, TRUE)))