Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/slpcall.c @ 25438:4b8c4870b13a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin.next.minor' (head 7305b29db7bd00d3261f348c71674c93aa31b327) to branch 'im.pidgin.pidgin' (head d8c03c68d591d9392607d954942ee58b8618d946)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 02 Mar 2009 04:18:40 +0000
parents 14b927f45ec5
children a6d84d9de605
comparison
equal deleted inserted replaced
25437:8998ca47e6d0 25438:4b8c4870b13a
45 #endif 45 #endif
46 46
47 if (!slpcall->pending && !slpcall->progress) 47 if (!slpcall->pending && !slpcall->progress)
48 { 48 {
49 msn_slpcall_destroy(slpcall); 49 msn_slpcall_destroy(slpcall);
50 return FALSE; 50 return TRUE;
51 } 51 }
52 52
53 slpcall->progress = FALSE; 53 slpcall->progress = FALSE;
54 54
55 return TRUE; 55 return TRUE;
220 { 220 {
221 slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id); 221 slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id);
222 222
223 if (slpcall != NULL) 223 if (slpcall != NULL)
224 { 224 {
225 if (slpcall->timer) 225 if (slpcall->timer) {
226 purple_timeout_remove(slpcall->timer); 226 purple_timeout_remove(slpcall->timer);
227 slpcall->timer = 0;
228 }
227 229
228 slpcall->cb(slpcall, body, body_len); 230 slpcall->cb(slpcall, body, body_len);
229 231
230 slpcall->wasted = TRUE; 232 slpcall->wasted = TRUE;
231 } 233 }