cpw.malu.xmpp.google_ft: 3375625c: include description (with the manifest) ...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 3375625c3ebfb1cc25412af5390ccbc8763f2b55
Parent:   9f7ee754c4047247db50781455801df88edcd53d
Author:   malu at pidgin.im
Date:     09/10/10 16:19:09
Branch:   im.pidgin.cpw.malu.xmpp.google_ft
URL: http://d.pidgin.im/viewmtn/revision/info/3375625c3ebfb1cc25412af5390ccbc8763f2b55

Changelog: 

include description (with the manifest) in the accept message. I'm not sure if this is really needed...

Changes against parent 9f7ee754c4047247db50781455801df88edcd53d

  patched  libpurple/protocols/jabber/google/google_share.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google/google_share.c	9bfc581e0c7d9d027d81c1ac3bd89ce504d80c58
+++ libpurple/protocols/jabber/google/google_share.c	f4386b8a2d1c99e2b2d56bb7bc4c58bf802c1412
@@ -34,6 +34,7 @@ typedef struct {
 	guint stream_id;
 	GList *remote_candidates; /* list of PurpleMediaCandidate */
 	gboolean got_relay;		/* this indicates if gotten relay credentials */
+	xmlnode *description;
 } GoogleShareSessionData;
 
 static void
@@ -61,12 +62,13 @@ google_share_init(PurpleXfer *xfer)
 				session->js->user->domain,
 				session->js->user->resource);
 	JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
+	xmlnode *sess = google_session_create_xmlnode(session, "accept");
 
 	/* send accept */
 	xmlnode_set_attrib(iq->node, "to", session->remote_jid);
 	xmlnode_set_attrib(iq->node, "from", me);
-	xmlnode_insert_child(iq->node,
-		google_session_create_xmlnode(session, "accept"));
+	xmlnode_insert_child(iq->node, sess);
+	xmlnode_insert_child(sess, xmlnode_copy(session_data->description));
 	jabber_iq_send(iq);
 	
 	/* start agent */
@@ -148,6 +150,7 @@ void google_share_handle_initiate(Jabber
 	guint size = atoi(xmlnode_get_attrib(file, "size"));
 	gchar *name =
 		xmlnode_get_data(xmlnode_get_child(file, "name"));
+	session_data->description = xmlnode_copy(description);
 	
 	purple_debug_info("google", "got file transfer offer\n");
 	session_data->xfer =