cpw.darkrain42.xmpp.disco: d36744bb: Fix merge.

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: d36744bb5558b30197d840639614630efc15fba0
Ancestor: a8ad6c9f60ec519daf40a9bc78ddb66e58e77936
Author: darkrain42 at pidgin.im
Date: 2009-04-29T23:23:51
Branch: im.pidgin.cpw.darkrain42.xmpp.disco
URL: http://d.pidgin.im/viewmtn/revision/info/d36744bb5558b30197d840639614630efc15fba0

Modified files:
        libpurple/protocols/jabber/disco.c

ChangeLog: 

Fix merge.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/disco.c	de6868ac5027d5f3a40e6efb7c01fb786c0b7946
+++ libpurple/protocols/jabber/disco.c	1e5103cae4b726035df385a056d88321a41f59a0
@@ -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 @@ static void jabber_disco_info_cb(JabberS
 		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)))