changeset 9772:5f7c81eeebd2

[gaim-migrate @ 10640] Another ft patch from Dave West. This one makes transfers appear in the ft dialog earlier. I'm a bit concerned that transfers might not be removed correctly when canceled early on. Or that they won't show up with the right status between the time they're initiated and the time the file actually begins being transferred. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 18 Aug 2004 04:22:31 +0000
parents 9812dde4323e
children 09f18996c2ea
files ChangeLog src/ft.c
diffstat 2 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Aug 18 04:13:35 2004 +0000
+++ b/ChangeLog	Wed Aug 18 04:22:31 2004 +0000
@@ -16,6 +16,8 @@
 	  (Felipe Contreras)
 	* The chat invite button has a correct label (Stu Tomlinson)
 	* The system log should leak fewer file descriptors now (Ka-Hing Cheung)
+	* File transfers appear in the file transfer window when they
+	  are initiated rather than when they begin transferring (Dave West)
 	* Better file transfer cancel messages for AIM (Dave West)
 
 version 0.81 (08/05/2004):
--- a/src/ft.c	Wed Aug 18 04:13:35 2004 +0000
+++ b/src/ft.c	Wed Aug 18 04:22:31 2004 +0000
@@ -320,8 +320,8 @@
 		gaim_xfer_set_local_filename(xfer, filename);
 	}
 
-
 	xfer->ops.init(xfer);
+	gaim_xfer_add(xfer);
 }
 
 void
@@ -713,11 +713,8 @@
 static void
 begin_transfer(GaimXfer *xfer, GaimInputCondition cond)
 {
-	GaimXferUiOps *ui_ops;
 	GaimXferType type = gaim_xfer_get_type(xfer);
 
-	ui_ops = gaim_xfer_get_ui_ops(xfer);
-
 	/*
 	 * We'll have already tried to open this earlier to make sure we can
 	 * read/write here. Should be safe.
@@ -733,9 +730,6 @@
 
 	xfer->watcher = gaim_input_add(xfer->fd, cond, transfer_cb, xfer);
 
-	if (ui_ops != NULL && ui_ops->add_xfer != NULL)
-		ui_ops->add_xfer(xfer);
-
 	if (xfer->ops.start != NULL)
 		xfer->ops.start(xfer);
 }