--- a/libpurple/blistnodetypes.h Tue Jul 09 15:42:36 2013 +0530 +++ b/libpurple/blistnodetypes.h Tue Jul 09 15:48:17 2013 +0530 @@ -301,7 +301,7 @@ * @param buddy The buddy whose status has changed. * @param old_status The status from which we are changing. */ -void purple_blist_update_buddy_status(PurpleBuddy *buddy, PurpleStatus *old_status); +void purple_buddy_update_status(PurpleBuddy *buddy, PurpleStatus *old_status); /** * Gets the media caps from a buddy. @@ -466,7 +466,7 @@ * @param source The contact to merge * @param node The place to merge to (a buddy or contact) */ -void purple_blist_merge_contact(PurpleContact *source, PurpleBListNode *node); +void purple_contact_merge(PurpleContact *source, PurpleBListNode *node); /*@}*/