# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1269296774 0
# Node ID 90dbc46a771f46555edda1d200cf40f78e82f066
# Parent  f14cbb6a28a7b09806f9db74ca4a0c01b6ee812f
Fixup merge

diff -r f14cbb6a28a7 -r 90dbc46a771f libpurple/protocols/jabber/data.c
--- a/libpurple/protocols/jabber/data.c	Mon Mar 22 21:45:23 2010 +0000
+++ b/libpurple/protocols/jabber/data.c	Mon Mar 22 22:26:14 2010 +0000
@@ -168,17 +168,6 @@
 	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)
 {