pidgin: 47d55927: We just freed slpcall, so don't set slpc...

markdoliner at pidgin.im markdoliner at pidgin.im
Thu Feb 26 14:50:31 EST 2009


-----------------------------------------------------------------
Revision: 47d559275fa8784f242537fb23888a1f9d4e486d
Ancestor: 0b5a9a19b155dbe2ae56ff02009fa6e9a354a55a
Author: markdoliner at pidgin.im
Date: 2009-02-26T19:47:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/47d559275fa8784f242537fb23888a1f9d4e486d

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

ChangeLog: 

We just freed slpcall, so don't set slpcall->timer to 0.  And return
TRUE because we don't need the timer to be canceled here, because
it will have been canceled by msn_slpcall_destroy()

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slpcall.c	a2cc6d33eca81094e50a6cbb1305739573067993
+++ libpurple/protocols/msn/slpcall.c	86677b63a56656430882aa0e2ab01ebab1bfa75e
@@ -47,8 +47,7 @@ msn_slpcall_timeout(gpointer data)
 	if (!slpcall->pending && !slpcall->progress)
 	{
 		msn_slpcall_destroy(slpcall);
-		slpcall->timer = 0;
-		return FALSE;
+		return TRUE;
 	}
 
 	slpcall->progress = FALSE;


More information about the Commits mailing list