pidgin: 66352dab: The "processing" flag basically says "th...

markdoliner at pidgin.im markdoliner at pidgin.im
Wed Nov 12 04:15:32 EST 2008


-----------------------------------------------------------------
Revision: 66352dab5a562440ff0b5c5486abcaef3ae65ced
Ancestor: cefc4cffe26a303c84c45e1fe51b03cf08af7419
Author: markdoliner at pidgin.im
Date: 2008-11-12T09:10:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/66352dab5a562440ff0b5c5486abcaef3ae65ced

Modified files:
        libpurple/protocols/msn/servconn.c

ChangeLog: 

The "processing" flag basically says "this connection is busy, don't
destroy it yet, wait until it's done processing."

I don't think there's any reason for us to set processing to TRUE just
because we're connecting.  I think this is a holdover from before our
purple_proxy_connect() could be canceled.  But now that it's cancelable,
if we want to kill the connection we can cleanly cancel the connect
without worrying about the callback being triggered.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/servconn.c	00215baa1e665e42e08711d64c5a6761a9200f22
+++ libpurple/protocols/msn/servconn.c	5443848259fee50004b9265f2b07a4461f8f9bcb
@@ -239,15 +239,7 @@ msn_servconn_connect(MsnServConn *servco
 	servconn->connect_data = purple_proxy_connect(NULL, session->account,
 			host, port, connect_cb, servconn);
 
-	if (servconn->connect_data != NULL)
-	{
-		servconn->processing = TRUE;
-		return TRUE;
-	}
-	else
-	{
-		return FALSE;
-	}
+	return (servconn->connect_data != NULL);
 }
 
 void


More information about the Commits mailing list