Mercurial > pidgin
diff libpurple/protocols/jabber/presence.c @ 24972:25e2ab1fff1d
propagate from branch 'im.pidgin.pidgin' (head dd7a36be12180dba9663c2b740553e89711d7644)
to branch 'im.pidgin.pidgin.vv' (head 2149cf9a6d4604f6e78ed9a2bdb0bbc3d6041a36)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sat, 06 Dec 2008 02:23:20 +0000 |
| parents | adf153852bcf 10ab5441572f |
| children | 68f4edb42f39 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c Sat Dec 06 02:20:09 2008 +0000 +++ b/libpurple/protocols/jabber/presence.c Sat Dec 06 02:23:20 2008 +0000 @@ -517,7 +517,7 @@ } else if(!strcmp(y->name, "delay") && !strcmp(xmlns, "urn:xmpp:delay")) { /* XXX: compare the time. jabber:x:delay can happen on presence packets that aren't really and truly delayed */ delayed = TRUE; - } else if(!strcmp(y->name, "c") && !strcmp(xmlns, "http://jabber.org/protocol/caps")) { + } else if(xmlns && !strcmp(y->name, "c") && !strcmp(xmlns, "http://jabber.org/protocol/caps")) { caps = y; /* store for later, when creating buddy resource */ } else if(!strcmp(y->name, "x")) { const char *xmlns = xmlnode_get_namespace(y);