pidgin: 2c144d51: Avoid canceling this timer twice

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 2c144d518c5cab8f06dc3158247517eec0c23b69
Ancestor: 0e02d55d1b8b8badfa78439d77bda433a7c66a73
Author: markdoliner at pidgin.im
Date: 2009-02-09T22:05:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2c144d518c5cab8f06dc3158247517eec0c23b69

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

ChangeLog: 

Avoid canceling this timer twice

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slpcall.c	4596f7be984074ba2cb9c953e4cd3c340b894791
+++ libpurple/protocols/msn/slpcall.c	a2cc6d33eca81094e50a6cbb1305739573067993
@@ -47,6 +47,7 @@ msn_slpcall_timeout(gpointer data)
 	if (!slpcall->pending && !slpcall->progress)
 	{
 		msn_slpcall_destroy(slpcall);
+		slpcall->timer = 0;
 		return FALSE;
 	}
 
@@ -222,8 +223,10 @@ msn_slp_process_msg(MsnSlpLink *slplink,
 
 		if (slpcall != NULL)
 		{
-			if (slpcall->timer)
+			if (slpcall->timer) {
 				purple_timeout_remove(slpcall->timer);
+				slpcall->timer = 0;
+			}
 
 			slpcall->cb(slpcall, body, body_len);