cpw.malu.ft_thumbnails: ce7131f6: Fixup merge

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: ce7131f6a58510cde83d0cb3945eca0795e1e2aa
Ancestor: 8fb263822df68da5dae36efbf788960d3970b32f
Author: malu at pidgin.im
Date: 2010-03-22T22:26:14
Branch: im.pidgin.cpw.malu.ft_thumbnails
URL: http://d.pidgin.im/viewmtn/revision/info/ce7131f6a58510cde83d0cb3945eca0795e1e2aa

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

ChangeLog: 

Fixup merge

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/data.c	9c7e3a5a7ea119849698b7c44877f8387d56c95f
+++ libpurple/protocols/jabber/data.c	94ede5d7311baf309b3d5b2f234b6549480a28e0
@@ -168,17 +168,6 @@ jabber_data_create_from_xml(xmlnode *tag
 	return data;
 }
 
-
-static void
-jabber_data_delete(gpointer cbdata)
-{
-	JabberData *data = cbdata;
-	g_free(data->cid);
-	g_free(data->type);
-	g_free(data->data);
-	g_free(data);
-}
-
 void
 jabber_data_destroy(JabberData *data)
 {