[Gaim-commits] CVS: gaim/src ft.c,1.62,1.63

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15438/src

Modified Files:
	ft.c 
Log Message:
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.


Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ft.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -p -r1.62 -r1.63
--- ft.c	18 Aug 2004 04:13:34 -0000	1.62
+++ ft.c	18 Aug 2004 04:22:31 -0000	1.63
@@ -320,8 +320,8 @@ gaim_xfer_request_accepted(GaimXfer *xfe
 		gaim_xfer_set_local_filename(xfer, filename);
 	}
 
-
 	xfer->ops.init(xfer);
+	gaim_xfer_add(xfer);
 }
 
 void
@@ -713,11 +713,8 @@ transfer_cb(gpointer data, gint source, 
 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 @@ begin_transfer(GaimXfer *xfer, GaimInput
 
 	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);
 }