pidgin: 780ee14f: Don't call purple_xfer_start in msn_xfer...

qulogic at pidgin.im qulogic at pidgin.im
Mon Dec 14 02:27:48 EST 2009


-----------------------------------------------------------------
Revision: 780ee14f6ced21de7257b3149c186223ab446d57
Ancestor: af5a118cb5194885a7b511864cb5dc3183648d07
Author: qulogic at pidgin.im
Date: 2009-12-14T06:50:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/780ee14f6ced21de7257b3149c186223ab446d57

Modified files:
        ChangeLog libpurple/protocols/msn/slp.c

ChangeLog: 

Don't call purple_xfer_start in msn_xfer_init. purple_xfer_start is called
later after the other side accepts, and this second call clobbers the file
handle. This file handle is leaked resulting in Pidgin appearing to lock
the file stopping Windows from being able to delete it.

The changes from darkrain42's branch actually fixed the real file handle
leak except for the addition of this one line.

Fixes #1643.

-------------- next part --------------
============================================================
--- ChangeLog	944bd3d88a5710c0ae7a634df87f2516ab35841f
+++ ChangeLog	15fa1e7926787fc2bd256ddae4203c18dd3c3d88
@@ -11,6 +11,8 @@ version 2.6.5 (??/??/20??):
 	MSN:
 	* File transfer requests will no longer cause a crash if you delete the file
 	  before the other side accepts.
+	* Recieved files will no longer hold an extra lock after completion, meaning
+	  they can be moved or deleted without complaints from your OS.
 
 	XMPP:
 	* Added support for the SCRAM-SHA-1 SASL mechanism.  This is only
============================================================
--- libpurple/protocols/msn/slp.c	1da3afd0c3ca769e04271f9895e47c1ea4e7ca65
+++ libpurple/protocols/msn/slp.c	6d32ce180e8f16b3c28824dc524ea95eb9e6fe34
@@ -96,8 +96,6 @@ msn_xfer_init(PurpleXfer *xfer)
 
 	g_free(content);
 	msn_slplink_send_queued_slpmsgs(slpcall->slplink);
-
-	purple_xfer_start(xfer, -1, NULL, 0);
 }
 
 void


More information about the Commits mailing list