diff libpurple/protocols/jabber/buddy.c @ 30959:8648453adb22

propagate from branch 'im.pidgin.pidgin' (head 96b27a20c7250b87761a8bd4f5540bf1fa32b6f4) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 303f4072d75faa7770a5339dbfea05da7cee30a4)
author Marcus Lundblad <ml@update.uu.se>
date Tue, 09 Mar 2010 21:41:41 +0000
parents fbefcfbb5377
children 618c4165d4f8
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.c	Thu Feb 18 22:42:19 2010 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Tue Mar 09 21:41:41 2010 +0000
@@ -218,7 +218,7 @@
 	for (l = jb->resources; l; l = l->next)
 	{
 		JabberBuddyResource *jbr = l->data;
-		if (g_str_equal(resource, jbr->name))
+		if (jbr->name && g_str_equal(resource, jbr->name))
 			return jbr;
 	}