Mercurial > pidgin.yaz

diff libpurple/protocols/bonjour/jabber.c @ 32827:4a34689eeb33 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged from im.pidgin.pidgin
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 19 Nov 2011 14:42:54 +0900
parents 1ffa35da9a7b
children
line wrap: on
line diff
--- a/libpurple/protocols/bonjour/jabber.c	Mon Sep 26 14:57:21 2011 +0900
+++ b/libpurple/protocols/bonjour/jabber.c	Sat Nov 19 14:42:54 2011 +0900
@@ -1164,7 +1164,7 @@
 				tmp_next = xfers->next;
 				/* We only need to cancel this if it hasn't actually started transferring. */
 				/* This will change if we ever support IBB transfers. */
-				if (strcmp(xfer->who, purple_buddy_get_name(bconv->pb)) == 0
+				if (strcmp(purple_xfer_get_remote_user(xfer), purple_buddy_get_name(bconv->pb)) == 0
 						&& (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_NOT_STARTED
 							|| purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_UNKNOWN)) {
 					purple_xfer_cancel_remote(xfer);