Mercurial > pidgin
comparison libpurple/protocols/msn/user.c @ 31558:ce968e115c95
propagate from branch 'im.pidgin.cpw.masca.p2p' (head 33ca865dacb9e5bcf763d06f6a42cbaca337cc64)
to branch 'im.pidgin.pidgin' (head 92f47f4e8b0cbb107fd97e1ab814d1cedbf109ad)
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Fri, 06 May 2011 06:25:14 +0000 |
| parents | f60a5bec2a0d |
| children | b48dfbb514d3 e091c8ea292e 3828a61c44da |
comparison
equal
deleted
inserted
replaced
| 31557:f021d93a1f9b | 31558:ce968e115c95 |
|---|---|
| 221 gboolean | 221 gboolean |
| 222 msn_user_set_friendly_name(MsnUser *user, const char *name) | 222 msn_user_set_friendly_name(MsnUser *user, const char *name) |
| 223 { | 223 { |
| 224 g_return_val_if_fail(user != NULL, FALSE); | 224 g_return_val_if_fail(user != NULL, FALSE); |
| 225 | 225 |
| 226 if (user->friendly_name && name && (!strcmp(user->friendly_name, name) || | 226 if (!name) |
| 227 return FALSE; | |
| 228 | |
| 229 if (user->friendly_name && (!strcmp(user->friendly_name, name) || | |
| 227 !strcmp(user->passport, name))) | 230 !strcmp(user->passport, name))) |
| 228 return FALSE; | 231 return FALSE; |
| 229 | 232 |
| 230 g_free(user->friendly_name); | 233 g_free(user->friendly_name); |
| 231 user->friendly_name = g_strdup(name); | 234 user->friendly_name = g_strdup(name); |