cpw.malu.ft_thumbnails: 3845c5c2: Merge fix

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 3845c5c2ec11e409fd1891793e73ab3d934001f9
Ancestor: b0f2d9686f710d656a34f18cbdd032390d491292
Author: malu at pidgin.im
Date: 2010-03-24T20:16:05
Branch: im.pidgin.cpw.malu.ft_thumbnails
URL: http://d.pidgin.im/viewmtn/revision/info/3845c5c2ec11e409fd1891793e73ab3d934001f9

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

ChangeLog: 

Merge fix

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/data.c	ba007bf6136505b0c5e28ca5d87c67d80d78b037
+++ libpurple/protocols/jabber/data.c	d4829d6ac89f655497cc973dce631b8b7ba6b847
@@ -314,7 +314,6 @@ jabber_data_find_remote_by_cid(JabberStr
     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) {