# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1220742704 0
# Node ID 7b11072ba907d75b052320c35a7951fb9de880be
# Parent  305fac6af8f99be18116695f186f157d105a0fa4
Removed commented out declarations (oops)
Removed unused #include (since JabberData no longer uses PurpleConversation)

diff -r 305fac6af8f9 -r 7b11072ba907 libpurple/protocols/jabber/data.c
--- a/libpurple/protocols/jabber/data.c	Fri Sep 05 21:55:09 2008 +0000
+++ b/libpurple/protocols/jabber/data.c	Sat Sep 06 23:11:44 2008 +0000
@@ -22,7 +22,6 @@
 #include "debug.h"
 #include "xmlnode.h"
 #include "util.h"
-#include "conversation.h"
 #include "iq.h"
 
 static GHashTable *local_data_by_alt = NULL;
diff -r 305fac6af8f9 -r 7b11072ba907 libpurple/protocols/jabber/data.h
--- a/libpurple/protocols/jabber/data.h	Fri Sep 05 21:55:09 2008 +0000
+++ b/libpurple/protocols/jabber/data.h	Sat Sep 06 23:11:44 2008 +0000
@@ -18,7 +18,6 @@
 #define JABBER_DATA_H
 
 #include "xmlnode.h"
-#include "conversation.h"
 #include "jabber.h"
 
 #define XEP_0231_NAMESPACE "urn:xmpp:bob"
@@ -62,24 +61,10 @@
 const JabberData *jabber_data_find_local_by_alt(const gchar *alt);
 const JabberData *jabber_data_find_local_by_cid(const gchar *cid);
 const JabberData *jabber_data_find_remote_by_cid(const gchar *cid);
-/*
-const JabberData *jabber_data_find_local_by_alt(PurpleConversation *conv,
-												const char *alt);
-const JabberData *jabber_data_find_local_by_cid(PurpleConversation *conv,
-												const char *cid);
-const JabberData *jabber_data_find_remote_by_cid(PurpleConversation *conv,
-												 const char *cid);
-*/
 												 
 /* store data objects */
 void jabber_data_associate_local(JabberData *data, const gchar *alt);
 void jabber_data_associate_remote(JabberData *data);
-/*
-void jabber_data_associate_local_with_conv(JabberData *data, PurpleConversation *conv,
-	const gchar *alt);
-void jabber_data_associate_remote_with_conv(JabberData *data, PurpleConversation *conv);
-void jabber_data_delete_associated_with_conv(PurpleConversation *conv);
-*/
 
 /* handles iq requests */
 void jabber_data_parse(JabberStream *js, xmlnode *packet);