pidgin: d3c73d69: Rename "userName" to "friendly_name" to ...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: d3c73d69688687fb6bc62852836a8e0bd1b51382
Parent:   a35f1cea0ac7e920cb25b8c7c9e6f15bb8209208
Author:   markdoliner at pidgin.im
Date:     02/28/11 01:53:53
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d3c73d69688687fb6bc62852836a8e0bd1b51382

Changelog: 

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

Changes against parent a35f1cea0ac7e920cb25b8c7c9e6f15bb8209208

  patched  libpurple/protocols/msn/userlist.c
  patched  libpurple/protocols/msn/userlist.h

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/userlist.c	4c69deea85c096a7eb99bf90fc47b487cfa82bbd
+++ libpurple/protocols/msn/userlist.c	80bafe4657ab7fa204289a0a6ac319caf9201769
@@ -236,17 +236,17 @@ MsnUser *
 }
 
 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 @@ msn_userlist_find_user_with_id(MsnUserLi
 MsnUser *
 msn_userlist_find_user_with_id(MsnUserList *userlist, const char *uid)
 {
- 	GList *l;
+	GList *l;
 
 	g_return_val_if_fail(uid != NULL, NULL);
 
============================================================
--- libpurple/protocols/msn/userlist.h	d475243651bb7c0b8b373da3a3c47083ddbcacd5
+++ libpurple/protocols/msn/userlist.h	72a56ce241066bc0c6a532456278c3d681eaf001
@@ -73,7 +73,7 @@ MsnUser * msn_userlist_find_add_user(Msn
 
 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);