cpw.malu.xmpp.jingle_ft: 4ee0e642: Removed an unused function and some (I t...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 4ee0e642066c91e31509a643909b231b677f7f81
Ancestor: 467aa8f56a09095d5a454b1e94a4b4639addaadf
Author: malu at pidgin.im
Date: 2009-10-05T20:46:08
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/4ee0e642066c91e31509a643909b231b677f7f81

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

ChangeLog: 

Removed an unused function and some (I think) superflueous g_object_unrefs
It still gets a gobject warning about g_object_unref: assertion `G_IS_OBJECT (object)' when finishing when being the initiator and using IBB, not sure what
the problem is just yet...

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/file-transfer.c	d912129c6ff98a5e604cff817e1136cfbc50fd1c
+++ libpurple/protocols/jabber/jingle/file-transfer.c	4a074222080a05a3471425c2ebd20b1e639686ae
@@ -196,24 +196,6 @@ static void
 }
 
 static void
-jingle_file_transfer_cancel_local(JingleContent *content)
-{
-	PurpleXfer *xfer = JINGLE_FT_GET_PRIVATE(JINGLE_FT(content))->xfer;
-	JingleSession *session = jingle_content_get_session(content);
-	
-	purple_debug_info("jingle-ft", "cancel local trasfer\n");
-	if (xfer) {
-		/* TODO: set a reason code */
-		jabber_iq_send(jingle_session_to_packet(session, 
-			JINGLE_SESSION_TERMINATE));
-		purple_xfer_cancel_local(xfer);
-	}
-
-	g_object_unref(session);
-	g_object_unref(session);	/* actually close the the session */
-}
-
-static void
 jingle_file_transfer_success(JingleContent *content)
 {
 	PurpleXfer *xfer = JINGLE_FT_GET_PRIVATE(JINGLE_FT(content))->xfer;
@@ -242,9 +224,6 @@ jingle_file_transfer_ibb_end(JingleConte
 		purple_xfer_set_completed(xfer, TRUE);
 		purple_xfer_end(xfer);
 	}
-
-	g_object_unref(session);
-	g_object_unref(session); /* actually delete it */
 }
 
 static gsize
@@ -656,7 +635,6 @@ jingle_file_transfer_xfer_end(PurpleXfer
 		 getting a session-terminate when we are the initiator */
 		JINGLE_FT_GET_PRIVATE(JINGLE_FT(xfer->data))->xfer = NULL;
 		g_object_unref(session);
-		g_object_unref(session);
 	}
 }