# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1255250219 -32400
# Node ID 659dde8c53a9115b003a2edb5b57d4c035296eb4
# Parent  291c89bfe04037f09576220b4237df73a4bcb459# Parent  53aab96e61a9527fe4a59cef66a2407b5059828b
merged with im.pidgin.pidgin

diff -r 291c89bfe040 -r 659dde8c53a9 libpurple/ft.c
--- a/libpurple/ft.c	Sun Oct 11 00:51:47 2009 +0900
+++ b/libpurple/ft.c	Sun Oct 11 17:36:59 2009 +0900
@@ -1030,7 +1030,7 @@
 				 * watcher.
 				 */
 				if (xfer->watcher != 0) {
-					purple_timeout_remove(xfer->watcher);
+					purple_input_remove(xfer->watcher);
 					xfer->watcher = 0;
 				}