changeset 31720:f60a5bec2a0d

Ignore display name updates that are NULL. In all cases, the new display name is either non-NULL, or the MsnUser is new and the saved display name is already NULL anyway. This change leads to the next revision...
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 01 Mar 2011 06:16:04 +0000
parents ccda2eba140b
children 69094d578a45
files libpurple/protocols/msn/user.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/user.c	Tue Mar 01 05:09:26 2011 +0000
+++ b/libpurple/protocols/msn/user.c	Tue Mar 01 06:16:04 2011 +0000
@@ -223,7 +223,10 @@
 {
 	g_return_val_if_fail(user != NULL, FALSE);
 
-	if (user->friendly_name && name && (!strcmp(user->friendly_name, name) ||
+	if (!name)
+		return FALSE;
+
+	if (user->friendly_name && (!strcmp(user->friendly_name, name) ||
 				!strcmp(user->passport, name)))
 		return FALSE;