xmpp.custom_smiley: 3cf127a6: Removed commented out declarations (oops...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 3cf127a603400e1e6fc04b76a176d55959d70495
Ancestor: 11d7e28e459d02d4584e4d88d21aa4fcaea0c714
Author: malu at pidgin.im
Date: 2008-09-06T23:11:44
Branch: im.pidgin.xmpp.custom_smiley
URL: http://d.pidgin.im/viewmtn/revision/info/3cf127a603400e1e6fc04b76a176d55959d70495

Modified files:
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h

ChangeLog: 

Removed commented out declarations (oops)
Removed unused #include (since JabberData no longer uses PurpleConversation)


-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/data.c	720f00ec45545ac07132cd09aad4c334a9f26633
+++ libpurple/protocols/jabber/data.c	328cad4e6edc4e23a2003d9d148b36e6e3f74804
@@ -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;
============================================================
--- libpurple/protocols/jabber/data.h	bcb82f4647411e03ba16b4cc1265d3835f7ded4b
+++ libpurple/protocols/jabber/data.h	fd516b199a3e3f4c34fbb8280f66af5de341d375
@@ -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_remot
 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);