Mercurial > pidgin
changeset 30741:417899347f8a
Remove msn_user_destroy in favor of msn_user_unref.
| author | masca@cpw.pidgin.im |
|---|---|
| date | Thu, 27 May 2010 22:14:53 +0000 |
| parents | 2cbcac894042 |
| children | a99b6dcdb60d |
| files | libpurple/protocols/msn/msn.c libpurple/protocols/msn/session.c libpurple/protocols/msn/user.c libpurple/protocols/msn/user.h libpurple/protocols/msn/userlist.c |
| diffstat | 5 files changed, 5 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Wed May 26 23:47:19 2010 +0000 +++ b/libpurple/protocols/msn/msn.c Thu May 27 22:14:53 2010 +0000 @@ -1700,7 +1700,7 @@ MsnUser *user2 = msn_userlist_find_user(userlist, who); if (user2 != NULL) { /* User already in userlist, so just update it. */ - msn_user_destroy(user); + msn_user_unref(user); user = user2; } else { msn_userlist_add_user(userlist, user); @@ -1720,7 +1720,7 @@ /* Remove from local list */ purple_blist_remove_buddy(buddy); - msn_user_destroy(user); + msn_user_unref(user); } g_free(group); }
--- a/libpurple/protocols/msn/session.c Wed May 26 23:47:19 2010 +0000 +++ b/libpurple/protocols/msn/session.c Thu May 27 22:14:53 2010 +0000 @@ -81,7 +81,7 @@ msn_nexus_destroy(session->nexus); if (session->user != NULL) - msn_user_destroy(session->user); + msn_user_unref(session->user); if (session->notification != NULL) msn_notification_destroy(session->notification);
--- a/libpurple/protocols/msn/user.c Wed May 26 23:47:19 2010 +0000 +++ b/libpurple/protocols/msn/user.c Thu May 27 22:14:53 2010 +0000 @@ -50,7 +50,7 @@ } /*destroy a user object*/ -void +static void msn_user_destroy(MsnUser *user) { g_return_if_fail(user != NULL);
--- a/libpurple/protocols/msn/user.h Wed May 26 23:47:19 2010 +0000 +++ b/libpurple/protocols/msn/user.h Thu May 27 22:14:53 2010 +0000 @@ -150,13 +150,6 @@ const char *friendly_name); /** - * Destroys a user structure. - * - * @param user The user to destroy. - */ -void msn_user_destroy(MsnUser *user); - -/** * Increment the reference count. * * @param user The user.
--- a/libpurple/protocols/msn/userlist.c Wed May 26 23:47:19 2010 +0000 +++ b/libpurple/protocols/msn/userlist.c Thu May 27 22:14:53 2010 +0000 @@ -210,7 +210,7 @@ /*destroy userlist*/ for (l = userlist->users; l != NULL; l = l->next) { - msn_user_destroy(l->data); + msn_user_unref(l->data); } g_list_free(userlist->users);