# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1242881380 0
# Node ID 5541ea5e9d1e02b07b67baefa58a977c0a17dda2
# Parent  cf373257effbc712647f78570cdfb7067c5bd544# Parent  c9ac5cc1e46c5818d1227261235a3ccb9581fd30
merge of '1864a53b79ca34679ff68b45b52e7385608e46cc'
     and '269c9bb016ef464d143d1bbd66dca0fa03030aa3'

diff -r cf373257effb -r 5541ea5e9d1e libpurple/protocols/jabber/presence.c
--- 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);