Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
30958:3d08b59ebf59 | 30959:8648453adb22 |
---|---|
216 return jb->resources ? jb->resources->data : NULL; | 216 return jb->resources ? jb->resources->data : NULL; |
217 | 217 |
218 for (l = jb->resources; l; l = l->next) | 218 for (l = jb->resources; l; l = l->next) |
219 { | 219 { |
220 JabberBuddyResource *jbr = l->data; | 220 JabberBuddyResource *jbr = l->data; |
221 if (g_str_equal(resource, jbr->name)) | 221 if (jbr->name && g_str_equal(resource, jbr->name)) |
222 return jbr; | 222 return jbr; |
223 } | 223 } |
224 | 224 |
225 return NULL; | 225 return NULL; |
226 } | 226 } |