cpw.malu.xmpp.google_ft: 6e1227d6: send response to session initiate immedi...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 6e1227d653df8e596625bb654cdc0abce84454b6
Parent:   50142c4180fdd7b63d77c7ae4671a231c9a582cd
Author:   malu at pidgin.im
Date:     09/29/10 16:44:14
Branch:   im.pidgin.cpw.malu.xmpp.google_ft
URL: http://d.pidgin.im/viewmtn/revision/info/6e1227d653df8e596625bb654cdc0abce84454b6

Changelog: 

send response to session initiate immediatly

Changes against parent 50142c4180fdd7b63d77c7ae4671a231c9a582cd

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

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google/google_share.c	abe4c9804dca4a6a33672b7a0359af5d1d0383f0
+++ libpurple/protocols/jabber/google/google_share.c	dfa46d41d8bcce32d12ec7509ce755c09ef5c7f1
@@ -615,15 +615,10 @@ google_relay_response_share_handle_initi
 {
 	GoogleShareSessionData *session_data =
 		(GoogleShareSessionData *) session->session_data;
-	JabberIq *result = jabber_iq_new(session->js, JABBER_IQ_RESULT);
 
 	purple_xfer_request(session_data->xfer);
 	google_share_init_agent(session, relay_ip, relay_udp, relay_tcp, relay_ssltcp,
 		relay_username, relay_password);
-
-	jabber_iq_set_id(result, session->iq_id);
-	xmlnode_set_attrib(result->node, "to", session->remote_jid);
-	jabber_iq_send(result);
 }
 
 void google_share_handle_initiate(JabberStream *js, GoogleSession *session,
@@ -643,7 +638,8 @@ void google_share_handle_initiate(Jabber
 	guint size = atoi(xmlnode_get_attrib(file, "size"));
 	gchar *name =
 		xmlnode_get_data(xmlnode_get_child(file, "name"));
-	
+	JabberIq *result = jabber_iq_new(session->js, JABBER_IQ_RESULT);
+
 	purple_debug_info("google", "got file transfer offer\n");
 	session_data->xfer =
 		purple_xfer_new(account, PURPLE_XFER_RECEIVE,
@@ -659,6 +655,11 @@ void google_share_handle_initiate(Jabber
 	session->session_data = session_data;
 	session->handle_transport_info_cb = google_share_handle_transport_info;
 
+	/* send response */
+	jabber_iq_set_id(result, session->iq_id);
+	xmlnode_set_attrib(result->node, "to", session->remote_jid);
+	jabber_iq_send(result);
+	
 	if (transport == NULL) {
 		session_data->old_protocol = TRUE;
 	}