cpw.malu.xmpp.jingle_ft: c1a0e7e8: Removed an outdated comment.
malu at pidgin.im
malu at pidgin.im
Tue Jun 1 16:15:50 EDT 2010
-----------------------------------------------------------------
Revision: c1a0e7e813b5e2543e7f5b4e9421995a0d51022a
Ancestor: 7a3603f1fc7bfea83297655c01786ad6e23e8954
Author: malu at pidgin.im
Date: 2010-06-01T20:13:05
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/c1a0e7e813b5e2543e7f5b4e9421995a0d51022a
Modified files:
libpurple/protocols/jabber/data.c
libpurple/protocols/jabber/jingle/file-transfer.c
libpurple/protocols/jabber/xfer.c
ChangeLog:
Removed an outdated comment.
Added guarding for a NULL argument to purple_debug_info
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/data.c bf7262ae17964ed2b2cf6f94c7f95f8c96a0c8a1
+++ libpurple/protocols/jabber/data.c 6fda9e25126487bc940d6926f96d328c0c9202b1
@@ -334,7 +334,7 @@ jabber_data_associate_local(JabberData *
jabber_data_associate_local(JabberData *data, const gchar *alt)
{
purple_debug_info("jabber", "associating local data object\n alt = %s, cid = %s\n",
- alt , jabber_data_get_cid(data));
+ alt ? alt : "(null)", jabber_data_get_cid(data));
if (alt)
g_hash_table_insert(local_data_by_alt, g_strdup(alt), data);
g_hash_table_insert(local_data_by_cid, g_strdup(jabber_data_get_cid(data)),
============================================================
--- libpurple/protocols/jabber/jingle/file-transfer.c 9247e81da9f81a439aa7a144721cc89ea6066730
+++ libpurple/protocols/jabber/jingle/file-transfer.c 840680cb139c3b29fa48b30cbe47a0e91fffdb78
@@ -697,6 +697,7 @@ jingle_file_transfer_to_xml_internal(Jin
JINGLE_FT_GET_PRIVATE(JINGLE_FT(ft))->thumbnail_cid));
}
}
+
return node;
}
============================================================
--- libpurple/protocols/jabber/xfer.c f0c7875618fd5c5171c44e32eab8df05ef259067
+++ libpurple/protocols/jabber/xfer.c 6358c383093ea205076faa9afbd79cdb0df7c4ee
@@ -198,7 +198,6 @@ jabber_xfer_create_file_element(const Pu
g_snprintf(buf, sizeof(buf), "%" G_GSIZE_FORMAT, xfer->size);
xmlnode_set_attrib(file, "size", buf);
/* maybe later we'll do hash and date attribs */
- /* ... and file transfer thumbnails :) */
/* add thumbnail, if appropriate */
if (thumb_cid) {
More information about the Commits
mailing list