changeset 23899:4ecea8ae3d21

merge of '3c1dec61837db8f0f51fc35f7ca26ff948a4e4f4' and 'd03f77d92751b3104fa7f211c86084c46a8679b7'

--- a/libpurple/protocols/msn/user.c	Mon Aug 25 23:10:00 2008 +0000
+++ b/libpurple/protocols/msn/user.c	Tue Aug 26 04:08:22 2008 +0000
@@ -84,6 +84,8 @@
 	PurpleAccount *account;
 	gboolean offline;
 
+	g_return_if_fail(user != NULL);
+
 	account = user->userlist->session->account;
 
 	offline = (user->status == NULL);
@@ -125,6 +127,8 @@
 {
 	const char *status;
 
+	g_return_if_fail(user != NULL);
+
 	if (state == NULL) {
 		user->status = NULL;
 		return;
@@ -282,7 +286,7 @@
 {
 	PurpleBuddy *buddy;
 
-	buddy =purple_find_buddy(account,name);
+	buddy = purple_find_buddy(account, name);
 	return PURPLE_BUDDY_IS_ONLINE(buddy);
 }