changeset 31261:087395608ed9

Rename "userName" to "friendly_name" to be consistent with the term we use for this everywhere, and to get rid of the camel case var name. Also remove a stray space
author Mark Doliner <mark@kingant.net>
date Mon, 28 Feb 2011 06:53:53 +0000
parents 3ff4467e4b46
children feb50c34ec46
files libpurple/protocols/msn/userlist.c libpurple/protocols/msn/userlist.h
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/userlist.c	Mon Feb 28 03:52:38 2011 +0000
+++ b/libpurple/protocols/msn/userlist.c	Mon Feb 28 06:53:53 2011 +0000
@@ -236,17 +236,17 @@
 }
 
 MsnUser *
-msn_userlist_find_add_user(MsnUserList *userlist,const char *passport,const char *userName)
+msn_userlist_find_add_user(MsnUserList *userlist, const char *passport, const char *friendly_name)
 {
 	MsnUser *user;
 
 	user = msn_userlist_find_user(userlist, passport);
 	if (user == NULL)
 	{
-		user = msn_user_new(userlist, passport, userName);
+		user = msn_user_new(userlist, passport, friendly_name);
 		msn_userlist_add_user(userlist, user);
 	} else {
-		msn_user_set_friendly_name(user, userName);
+		msn_user_set_friendly_name(user, friendly_name);
 	}
 	return user;
 }
@@ -287,7 +287,7 @@
 MsnUser *
 msn_userlist_find_user_with_id(MsnUserList *userlist, const char *uid)
 {
- 	GList *l;
+	GList *l;
 
 	g_return_val_if_fail(uid != NULL, NULL);
 
--- a/libpurple/protocols/msn/userlist.h	Mon Feb 28 03:52:38 2011 +0000
+++ b/libpurple/protocols/msn/userlist.h	Mon Feb 28 06:53:53 2011 +0000
@@ -73,7 +73,7 @@
 
 MsnUser * msn_userlist_find_user(MsnUserList *userlist, const char *passport);
 MsnUser * msn_userlist_find_add_user(MsnUserList *userlist,
-				const char *passport, const char *userName);
+				const char *passport, const char *friendly_name);
 MsnUser * msn_userlist_find_user_with_id(MsnUserList *userlist, const char *uid);
 MsnUser * msn_userlist_find_user_with_mobile_phone(MsnUserList *userlist, const char *number);