cpw.malu.xmpp.jingle_ft: a1bed004: Tell the UI to generate a thumbnail for ...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: a1bed004d6a995c05ec80f3335187aef96b23a93
Ancestor: c4f7127dd8e10256b403364f3950e5302757aa54
Author: malu at pidgin.im
Date: 2010-06-09T21:30:13
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/a1bed004d6a995c05ec80f3335187aef96b23a93

Modified files:
        libpurple/protocols/jabber/jingle/file-transfer.c

ChangeLog: 

Tell the UI to generate a thumbnail for a transfer before initiating the
transport, this should make thumbnails actually get included in the case
when IBB is the first choice (and session-initiate is sent immediatly).

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/file-transfer.c	840680cb139c3b29fa48b30cbe47a0e91fffdb78
+++ libpurple/protocols/jabber/jingle/file-transfer.c	e743cda192113a9e3df57256b126990056f4bbb4
@@ -500,6 +500,10 @@ jingle_file_transfer_xfer_init(PurpleXfe
 			content, xfer);
 		xfer->data = content;
 
+		/* ask UI to create a thumbnail */
+		JINGLE_FT_GET_PRIVATE(JINGLE_FT(content))->thumbnail_cid =
+			jabber_xfer_add_thumbnail(js, xfer);
+
 		if (JINGLE_IS_IBB(transport)) {
 			/* if it's IBB, send session-intitate directly */
 			jabber_iq_send(jingle_session_to_packet(session, 
@@ -518,10 +522,6 @@ jingle_file_transfer_xfer_init(PurpleXfe
 			/* start local listen on the S5B transport */
 			jingle_s5b_gather_candidates(session, JINGLE_S5B(transport));
 		}
-
-		/* ask UI to create a thumbnail */
-		JINGLE_FT_GET_PRIVATE(JINGLE_FT(content))->thumbnail_cid =
-			jabber_xfer_add_thumbnail(js, xfer);
 	} else if (xfer->data) {
 		JingleContent *content = (JingleContent *) xfer->data;
 		JingleSession *session = jingle_content_get_session(content);