pidgin: e9834fb7: Pass the handle in here, which causes th...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: e9834fb74620146356dcf39a70f200f0fab239db
Ancestor: 1d9e578b40de6dcea2cb950667d6db7a8a84547f
Author: markdoliner at pidgin.im
Date: 2009-06-18T23:31:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e9834fb74620146356dcf39a70f200f0fab239db

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

Pass the handle in here, which causes the connection attempt to be
canceled and freed if the gc is destroyed, eliminating the need
for PURPLE_CONNECTION_IS_VALID

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	bf2102205c7cbb9777cb7bb8e8707b1edf712c58
+++ libpurple/protocols/oscar/oscar.c	8659f12905978593f94992adbc46446f2310c8d7
@@ -1833,13 +1833,6 @@ straight_to_hell(gpointer data, gint sou
 	gchar *buf;
 	gssize result;
 
-	if (!PURPLE_CONNECTION_IS_VALID(pos->gc))
-	{
-		g_free(pos->modname);
-		g_free(pos);
-		return;
-	}
-
 	pos->fd = source;
 
 	if (source < 0) {
@@ -1937,8 +1930,7 @@ int purple_memrequest(OscarData *od, Fla
 	pos->len = len;
 	pos->modname = g_strdup(modname);
 
-	/* TODO: Keep track of this return value. */
-	if (purple_proxy_connect(NULL, pos->gc->account, "pidgin.im", 80,
+	if (purple_proxy_connect(pos->gc, pos->gc->account, "pidgin.im", 80,
 			straight_to_hell, pos) == NULL)
 	{
 		char buf[256];