comparison libpurple/protocols/oscar/oft.c @ 30909:25e200cb3532

propagate from branch 'im.pidgin.pidgin' (head dca20e09164518b0f7a773edd7e9649f41d8873d) to branch 'im.pidgin.cpw.malu.xmpp.google_refactor' (head 7823c556f2d1bbca43f5ef9f0fea30cabc5d313f)
author Marcus Lundblad <ml@update.uu.se>
date Tue, 31 Aug 2010 18:28:10 +0000
parents 1cdae196aac8
children c5ba7dd399fa de168bbf1e43
comparison
equal deleted inserted replaced
30908:c44ec533a48c 30909:25e200cb3532
238 */ 238 */
239 void 239 void
240 peer_oft_close(PeerConnection *conn) 240 peer_oft_close(PeerConnection *conn)
241 { 241 {
242 /* 242 /*
243 * If canceled by local user, and we're receiving a file, and 243 * If cancelled by local user, and we're receiving a file, and
244 * we're not connected/ready then send an ICBM cancel message. 244 * we're not connected/ready then send an ICBM cancel message.
245 */ 245 */
246 if ((purple_xfer_get_status(conn->xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) && 246 if ((purple_xfer_get_status(conn->xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) &&
247 !conn->ready) 247 !conn->ready)
248 { 248 {