[Gaim-commits] SF.net SVN: gaim: [18067] trunk/libgaim/protocols/oscar/oft.c

[<ev...@us...>]

Revision: 18067
          http://svn.sourceforge.net/gaim/?rev=18067&view=rev
Author:   evands
Date:     2007-01-03 06:02:44 -0800 (Wed, 03 Jan 2007)

Log Message:
-----------
Patch from Graham Booker which fixes a crash after a successful OSCAR file transfer. gaim_xfer_end() is called by ft.c's transfer_cb() when the transfer completes so does not need to be called here; peer_connection_schedule_destroy() should be called instead.

Modified Paths:
--------------
    trunk/libgaim/protocols/oscar/oft.c

Modified: trunk/libgaim/protocols/oscar/oft.c
===================================================================
--- trunk/libgaim/protocols/oscar/oft.c	2007-01-03 02:07:05 UTC (rev 18066)
+++ trunk/libgaim/protocols/oscar/oft.c	2007-01-03 14:02:44 UTC (rev 18067)
@@ -382,7 +382,8 @@
 	conn->watcher_incoming = 0;
 	conn->xfer->fd = conn->fd;
 	conn->fd = -1;
-	gaim_xfer_end(conn->xfer);
+	conn->disconnect_reason = OSCAR_DISCONNECT_DONE;
+	peer_connection_schedule_destroy(conn, conn->disconnect_reason, NULL);
 }
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.