changeset 29829:90dbc46a771f

Fixup merge
author Marcus Lundblad <ml@update.uu.se>
date Mon, 22 Mar 2010 22:26:14 +0000
parents f14cbb6a28a7
children 38926d6e5ae1
files libpurple/protocols/jabber/data.c
diffstat 1 files changed, 0 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- 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)
 {