changeset 26924:5541ea5e9d1e

merge of '1864a53b79ca34679ff68b45b52e7385608e46cc' and '269c9bb016ef464d143d1bbd66dca0fa03030aa3'
author Paul Aurich <paul@darkrain42.org>
date Thu, 21 May 2009 04:49:40 +0000
parents cf373257effb (current diff) c9ac5cc1e46c (diff)
children e45fe73b47e3 fdd2952d8639
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c	Wed May 20 17:24:52 2009 +0000
+++ b/libpurple/protocols/jabber/presence.c	Thu May 21 04:49:40 2009 +0000
@@ -361,10 +361,10 @@
 		if ((nick = xmlnode_get_child(vcard, "NICKNAME"))) {
 			char *tmp = xmlnode_get_data(nick);
 			char *bare_jid = jabber_get_bare_jid(from);
-			if (strstr(bare_jid, tmp) == NULL) {
+			if (tmp && strstr(bare_jid, tmp) == NULL) {
 				g_free(nickname);
 				nickname = tmp;
-			} else
+			} else if (tmp)
 				g_free(tmp);
 
 			g_free(bare_jid);