Mercurial > pidgin
comparison libpurple/protocols/jabber/si.c @ 21561:7109257d4612
merge of '1084824bf3739139306602c736073dd294ca4206'
and '3168753fae3715f5af1b820af8546d12810d704e'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 17 Nov 2007 00:56:02 +0000 |
| parents | 665e04562de0 4e98fb3661cc |
| children | a4b6854737d5 |
comparison
equal
deleted
inserted
replaced
| 21560:665e04562de0 | 21561:7109257d4612 |
|---|---|
| 822 /* they've specified a resource, no need to ask or | 822 /* they've specified a resource, no need to ask or |
| 823 * default or anything, just do it */ | 823 * default or anything, just do it */ |
| 824 | 824 |
| 825 do_transfer_send(xfer, resource); | 825 do_transfer_send(xfer, resource); |
| 826 g_free(resource); | 826 g_free(resource); |
| 827 return; | |
| 827 } | 828 } |
| 828 | 829 |
| 829 jb = jabber_buddy_find(jsx->js, xfer->who, TRUE); | 830 jb = jabber_buddy_find(jsx->js, xfer->who, TRUE); |
| 830 | 831 |
| 831 if(!jb || !jb->resources) { | 832 if(!jb || !jb->resources) { |