Mercurial > pidgin.yaz
comparison libpurple/protocols/bonjour/jabber.c @ 32827:4a34689eeb33 default tip
merged from im.pidgin.pidgin
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Sat, 19 Nov 2011 14:42:54 +0900 |
| parents | 1ffa35da9a7b |
| children |
comparison
equal
deleted
inserted
replaced
| 32692:0f94ec89f0bc | 32827:4a34689eeb33 |
|---|---|
| 1162 while(xfers != NULL) { | 1162 while(xfers != NULL) { |
| 1163 PurpleXfer *xfer = xfers->data; | 1163 PurpleXfer *xfer = xfers->data; |
| 1164 tmp_next = xfers->next; | 1164 tmp_next = xfers->next; |
| 1165 /* We only need to cancel this if it hasn't actually started transferring. */ | 1165 /* We only need to cancel this if it hasn't actually started transferring. */ |
| 1166 /* This will change if we ever support IBB transfers. */ | 1166 /* This will change if we ever support IBB transfers. */ |
| 1167 if (strcmp(xfer->who, purple_buddy_get_name(bconv->pb)) == 0 | 1167 if (strcmp(purple_xfer_get_remote_user(xfer), purple_buddy_get_name(bconv->pb)) == 0 |
| 1168 && (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_NOT_STARTED | 1168 && (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_NOT_STARTED |
| 1169 || purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_UNKNOWN)) { | 1169 || purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_UNKNOWN)) { |
| 1170 purple_xfer_cancel_remote(xfer); | 1170 purple_xfer_cancel_remote(xfer); |
| 1171 } | 1171 } |
| 1172 xfers = tmp_next; | 1172 xfers = tmp_next; |