Mercurial > pidgin.yaz
diff src/blist.h @ 7246:cb6bf374c7ee
[gaim-migrate @ 7823]
1. fix 822297 (add/remove button in conv window not changing)
2. make dragging a contact into an expanded contact put the dragged one
where you wanted it
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Mon, 13 Oct 2003 03:48:36 +0000 |
parents | 208cb260d7a7 |
children | b8ce6e194cff |
line wrap: on
line diff
--- a/src/blist.h Mon Oct 13 00:11:48 2003 +0000 +++ b/src/blist.h Mon Oct 13 03:48:36 2003 +0000 @@ -438,9 +438,9 @@ * All of the buddies from source will be moved to target * * @param source The contact to merge - * @param target The contact to be merged into + * @param node The place to merge to (a buddy or contact) */ -void gaim_blist_merge_contact(GaimContact *source, GaimContact *target); +void gaim_blist_merge_contact(GaimContact *source, GaimBlistNode *node); /** * Returns the highest priority buddy for a given contact.