changeset 29831:816041183dda

Merge fix
author Marcus Lundblad <ml@update.uu.se>
date Wed, 24 Mar 2010 20:16:05 +0000
parents 38926d6e5ae1
children 2ab17571bf42
files libpurple/protocols/jabber/data.c
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/data.c	Wed Mar 24 19:56:07 2010 +0000
+++ b/libpurple/protocols/jabber/data.c	Wed Mar 24 20:16:05 2010 +0000
@@ -314,7 +314,6 @@
     const gchar *cid)
 {
 	const JabberData *data = g_hash_table_lookup(remote_data_by_cid, cid);
-	purple_debug_info("jabber", "lookup remote smiley with cid = %s\n", cid);
 	purple_debug_info("jabber", "lookup remote data object with cid = %s\n", cid);
 
 	if (data == NULL) {