cpw.malu.xmpp.jingle_ft: aa203574: Don't print double error message when fa...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: aa203574434cc9c9e6b22ce23282ecc66ddd3069
Parent:   3d5b67c436846fee70f48b46f5c9e7d294201ef2
Author:   malu at pidgin.im
Date:     11/15/10 17:23:10
Branch:   im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/aa203574434cc9c9e6b22ce23282ecc66ddd3069

Changelog: 

Don't print double error message when failing a file transfer (also for Jingle ft)

Changes against parent 3d5b67c436846fee70f48b46f5c9e7d294201ef2

  patched  libpurple/protocols/jabber/jingle/file-transfer.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/file-transfer.c	28739a3e28b8a3e3004c8d4df4d47c0796288377
+++ libpurple/protocols/jabber/jingle/file-transfer.c	564d3151a99105c37a53e5b8f4c199cb48605870
@@ -284,20 +284,10 @@ jingle_file_transfer_ibb_error_callback(
 jingle_file_transfer_ibb_error_callback(JingleContent *content)
 {
 	PurpleXfer *xfer = JINGLE_FT_GET_PRIVATE(JINGLE_FT(content))->xfer;
-	JingleSession *session = jingle_content_get_session(content);
-	JabberStream *js = 
-		jingle_session_get_js(session);
-	PurpleConnection *gc = js->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	gchar *who = jingle_session_get_remote_jid(session);
 	
 	purple_debug_error("jingle-ft", 
 		"an error occured during IBB file transfer\n");
-	purple_xfer_error(purple_xfer_get_type(xfer), account, who,
-		_("An error occured on the in-band bytestream transfer\n"));
 	purple_xfer_cancel_remote(xfer);
-	g_free(who);
-	g_object_unref(session);
 }
 
 static void
@@ -354,20 +344,10 @@ jingle_file_transfer_s5b_error_callback(
 jingle_file_transfer_s5b_error_callback(JingleContent *content)
 {
 	PurpleXfer *xfer = JINGLE_FT_GET_PRIVATE(JINGLE_FT(content))->xfer;
-	JingleSession *session = jingle_content_get_session(content);
-	JabberStream *js = 
-		jingle_session_get_js(session);
-	PurpleConnection *gc = js->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	gchar *who = jingle_session_get_remote_jid(session);
-	
+
 	purple_debug_error("jingle-ft", 
 		"an error occured during SOCKS5 file transfer\n");
-	purple_xfer_error(purple_xfer_get_type(xfer), account, who,
-		_("An error occured on the SOCKS5 transfer\n"));
 	purple_xfer_cancel_remote(xfer);
-	g_free(who);
-	g_object_unref(session);
 }
 
 
@@ -406,17 +386,12 @@ jingle_file_transfer_s5b_connect_failed_
 			jabber_iq_send(transport_replace);
 		} else {
 			/* the buddy doesn't support IBB, terminate it */
-			JabberStream *js = jingle_session_get_js(session);
-			PurpleConnection *gc = js->gc;
-			PurpleAccount *account = purple_connection_get_account(gc);
 			JabberIq *session_terminate =
 				jingle_session_terminate_packet(session, "connectivity-error");
 
 			purple_debug_error("jingle-ft", 
 				"could not establish s5b connection, and IBB is not "
 				"available\n");
-			purple_xfer_error(purple_xfer_get_type(xfer), account, who,
-				_("Failed to establish a SOCKS5 connection\n"));
 			purple_xfer_cancel_remote(xfer);
 			
 			jabber_iq_send(session_terminate);