# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1234217114 0
# Node ID 5fd2102643d56083dd7ded6ed77e7d36bd1ad9ae
# Parent  cddd7961901f5f81e245829ebdc868396f8acd96
Avoid canceling this timer twice

diff -r cddd7961901f -r 5fd2102643d5 libpurple/protocols/msn/slpcall.c
--- a/libpurple/protocols/msn/slpcall.c	Sun Feb 08 10:34:31 2009 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Mon Feb 09 22:05:14 2009 +0000
@@ -47,6 +47,7 @@
 	if (!slpcall->pending && !slpcall->progress)
 	{
 		msn_slpcall_destroy(slpcall);
+		slpcall->timer = 0;
 		return FALSE;
 	}
 
@@ -222,8 +223,10 @@
 
 		if (slpcall != NULL)
 		{
-			if (slpcall->timer)
+			if (slpcall->timer) {
 				purple_timeout_remove(slpcall->timer);
+				slpcall->timer = 0;
+			}
 
 			slpcall->cb(slpcall, body, body_len);