comparison 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
comparison
equal deleted inserted replaced
24970:99055b8db16b 24972:25e2ab1fff1d
515 g_free(p); 515 g_free(p);
516 } 516 }
517 } else if(!strcmp(y->name, "delay") && !strcmp(xmlns, "urn:xmpp:delay")) { 517 } else if(!strcmp(y->name, "delay") && !strcmp(xmlns, "urn:xmpp:delay")) {
518 /* XXX: compare the time. jabber:x:delay can happen on presence packets that aren't really and truly delayed */ 518 /* XXX: compare the time. jabber:x:delay can happen on presence packets that aren't really and truly delayed */
519 delayed = TRUE; 519 delayed = TRUE;
520 } else if(!strcmp(y->name, "c") && !strcmp(xmlns, "http://jabber.org/protocol/caps")) { 520 } else if(xmlns && !strcmp(y->name, "c") && !strcmp(xmlns, "http://jabber.org/protocol/caps")) {
521 caps = y; /* store for later, when creating buddy resource */ 521 caps = y; /* store for later, when creating buddy resource */
522 } else if(!strcmp(y->name, "x")) { 522 } else if(!strcmp(y->name, "x")) {
523 const char *xmlns = xmlnode_get_namespace(y); 523 const char *xmlns = xmlnode_get_namespace(y);
524 if(xmlns && !strcmp(xmlns, "jabber:x:delay")) { 524 if(xmlns && !strcmp(xmlns, "jabber:x:delay")) {
525 /* XXX: compare the time. jabber:x:delay can happen on presence packets that aren't really and truly delayed */ 525 /* XXX: compare the time. jabber:x:delay can happen on presence packets that aren't really and truly delayed */