# HG changeset patch
# User masca@cpw.pidgin.im
# Date 1274998493 0
# Node ID 417899347f8a009a3293422267ec42e4782aafc3
# Parent  2cbcac8940424d5cac90079b26fcb745bbe44bd3
Remove msn_user_destroy in favor of msn_user_unref.

diff -r 2cbcac894042 -r 417899347f8a libpurple/protocols/msn/msn.c
--- 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);
 }
diff -r 2cbcac894042 -r 417899347f8a libpurple/protocols/msn/session.c
--- 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);
diff -r 2cbcac894042 -r 417899347f8a libpurple/protocols/msn/user.c
--- 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);
diff -r 2cbcac894042 -r 417899347f8a libpurple/protocols/msn/user.h
--- 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.
diff -r 2cbcac894042 -r 417899347f8a libpurple/protocols/msn/userlist.c
--- 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);