comparison libpurple/protocols/jabber/data.c @ 29831:816041183dda

Merge fix
author Marcus Lundblad <ml@update.uu.se>
date Wed, 24 Mar 2010 20:16:05 +0000
parents 38926d6e5ae1
children 2ab17571bf42
comparison
equal deleted inserted replaced
29830:38926d6e5ae1 29831:816041183dda
312 const JabberData * 312 const JabberData *
313 jabber_data_find_remote_by_cid(JabberStream *js, const gchar *who, 313 jabber_data_find_remote_by_cid(JabberStream *js, const gchar *who,
314 const gchar *cid) 314 const gchar *cid)
315 { 315 {
316 const JabberData *data = g_hash_table_lookup(remote_data_by_cid, cid); 316 const JabberData *data = g_hash_table_lookup(remote_data_by_cid, cid);
317 purple_debug_info("jabber", "lookup remote smiley with cid = %s\n", cid);
318 purple_debug_info("jabber", "lookup remote data object with cid = %s\n", cid); 317 purple_debug_info("jabber", "lookup remote data object with cid = %s\n", cid);
319 318
320 if (data == NULL) { 319 if (data == NULL) {
321 gchar *jid_cid = 320 gchar *jid_cid =
322 g_strdup_printf("%s@%s/%s%s%s", js->user->node, js->user->domain, 321 g_strdup_printf("%s@%s/%s%s%s", js->user->node, js->user->domain,