pidgin: cd1af7d3: This doesn't appear to be a programming ...

qulogic at pidgin.im qulogic at pidgin.im
Fri May 21 18:05:31 EDT 2010


-----------------------------------------------------------------
Revision: cd1af7d3c5d8da1569511bd9070c6758850bcc9f
Ancestor: 24f4cc196fecb13546e938fa413711a031289aa6
Author: qulogic at pidgin.im
Date: 2010-04-19T08:20:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cd1af7d3c5d8da1569511bd9070c6758850bcc9f

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

ChangeLog: 

This doesn't appear to be a programming error.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slp.c	30d182d313748a37dec731e9c411f7118b76d283
+++ libpurple/protocols/msn/slp.c	ef9ccd782197b1aad8593d74981ea52f21d43ca3
@@ -667,7 +667,8 @@ got_invite(MsnSlpCall *slpcall,
 		g_return_if_fail(slpcall->xfer != NULL);
 
 		/* Don't do anything if we already have a direct connection */
-		g_return_if_fail(slpcall->slplink->dc == NULL);
+		if (slpcall->slplink->dc != NULL)
+			return;
 
 		bridges = get_token(content, "Bridges: ", "\r\n");
 		if(bridges && strstr(bridges, "TCPv1") != NULL) {


More information about the Commits mailing list