Mercurial > pidgin
comparison libpurple/protocols/msn/slplink.c @ 29819:10bf97a36be0
propagate from branch 'im.pidgin.pidgin' (head 96b27a20c7250b87761a8bd4f5540bf1fa32b6f4)
to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head 230fd6c21fdf1ed459a653bcd9808880a36204c3)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 09 Mar 2010 21:41:55 +0000 |
| parents | 3175b89c5156 a0adf0bb19b7 |
| children | 79bb2804a19e |
comparison
equal
deleted
inserted
replaced
| 29818:fd354d0bfbc0 | 29819:10bf97a36be0 |
|---|---|
| 305 | 305 |
| 306 real_size = (slpmsg->flags == 0x2) ? 0 : slpmsg->size; | 306 real_size = (slpmsg->flags == 0x2) ? 0 : slpmsg->size; |
| 307 | 307 |
| 308 slpmsg->offset += msg->msnslp_header.length; | 308 slpmsg->offset += msg->msnslp_header.length; |
| 309 | 309 |
| 310 slpmsg->msgs = g_list_remove(slpmsg->msgs, msg); | |
| 311 | |
| 310 if (slpmsg->offset < real_size) | 312 if (slpmsg->offset < real_size) |
| 311 { | 313 { |
| 312 if (slpmsg->slpcall->xfer && purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED) | 314 if (slpmsg->slpcall->xfer && purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED) |
| 313 { | 315 { |
| 314 slpmsg->slpcall->xfer_msg = slpmsg; | 316 slpmsg->slpcall->xfer_msg = slpmsg; |
| 329 slpmsg->slpcall->cb(slpmsg->slpcall, | 331 slpmsg->slpcall->cb(slpmsg->slpcall, |
| 330 NULL, 0); | 332 NULL, 0); |
| 331 } | 333 } |
| 332 } | 334 } |
| 333 } | 335 } |
| 334 | |
| 335 slpmsg->msgs = g_list_remove(slpmsg->msgs, msg); | |
| 336 } | 336 } |
| 337 | 337 |
| 338 /* We have received the message nak. */ | 338 /* We have received the message nak. */ |
| 339 static void | 339 static void |
| 340 msg_nak(MsnMessage *msg, void *data) | 340 msg_nak(MsnMessage *msg, void *data) |