cpw.malu.xmpp.jingle_ft: ad5fe7d4: Don't crash when initiating a new transf...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: ad5fe7d4a607ffbb8e963ab78cd264d0c8fb96c9
Ancestor: 91e1a7ed6c7acf8625f6b6e6cef97ccc57355255
Author: malu at pidgin.im
Date: 2010-01-25T21:54:59
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/ad5fe7d4a607ffbb8e963ab78cd264d0c8fb96c9

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

ChangeLog: 

Don't crash when initiating a new transfer when a previous one was cancelled before it it had started
(ie. a denied session).

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/file-transfer.c	14e7ca5bc5a838a0a1606348ecfb7f0157cc722b
+++ libpurple/protocols/jabber/jingle/file-transfer.c	872a01aee02a172f73579c373289c4153a1b8d01
@@ -790,7 +790,7 @@ jingle_file_transfer_handle_action_inter
 				JINGLE_FT_GET_PRIVATE(JINGLE_FT(content))->xfer = NULL;
 				xfer->data = NULL;
 			}
-	
+
 			g_object_unref(session);
 			break;
 		}
============================================================
--- libpurple/protocols/jabber/jingle/s5b.c	b842050b166beffc58c40ed0b3f550d703e67f77
+++ libpurple/protocols/jabber/jingle/s5b.c	61d4ceb11ce3081791da9b29a896d6aa3f57050e
@@ -588,6 +588,11 @@ jingle_s5b_stop_connection_attempts(Jing
 		purple_timeout_remove(s5b->priv->connect_timeout);
 		s5b->priv->connect_timeout = 0;
 	}
+
+	if (s5b->priv->watcher != 0) {
+		purple_input_remove(s5b->priv->watcher);
+		s5b->priv->watcher = 0;
+	}
 }