Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
7245:747b9e00ef60 | 7246:cb6bf374c7ee |
---|---|
436 * Merges two contacts | 436 * Merges two contacts |
437 * | 437 * |
438 * All of the buddies from source will be moved to target | 438 * All of the buddies from source will be moved to target |
439 * | 439 * |
440 * @param source The contact to merge | 440 * @param source The contact to merge |
441 * @param target The contact to be merged into | 441 * @param node The place to merge to (a buddy or contact) |
442 */ | 442 */ |
443 void gaim_blist_merge_contact(GaimContact *source, GaimContact *target); | 443 void gaim_blist_merge_contact(GaimContact *source, GaimBlistNode *node); |
444 | 444 |
445 /** | 445 /** |
446 * Returns the highest priority buddy for a given contact. | 446 * Returns the highest priority buddy for a given contact. |
447 * | 447 * |
448 * @param contact The contact | 448 * @param contact The contact |