Mercurial > pidgin
comparison libpurple/protocols/jabber/presence.c @ 27591:f44eda839ea4
explicit merge of 'c273f8da9712cac21aae5bcbd3d4790f8ee78f79'
and 'a90257133c31b066ad5d8e9df4fada3a482ccd82'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 16 Jul 2009 20:06:27 +0000 |
| parents | affa3b67c651 a08e84032814 |
| children | b448b259e3cf |
comparison
equal
deleted
inserted
replaced
| 27585:75e80bfa4101 | 27591:f44eda839ea4 |
|---|---|
| 611 } | 611 } |
| 612 } else if(xmlns == NULL) { | 612 } else if(xmlns == NULL) { |
| 613 /* The rest of the cases used to check xmlns individually. */ | 613 /* The rest of the cases used to check xmlns individually. */ |
| 614 continue; | 614 continue; |
| 615 } else if(!strcmp(y->name, "delay") && !strcmp(xmlns, "urn:xmpp:delay")) { | 615 } else if(!strcmp(y->name, "delay") && !strcmp(xmlns, "urn:xmpp:delay")) { |
| 616 /* XXX: compare the time. urn:xmpp:delay can happen on presence packets that aren't really and truly delayed */ | 616 /* XXX: compare the time. jabber:x:delay can happen on presence packets that aren't really and truly delayed */ |
| 617 delayed = TRUE; | 617 delayed = TRUE; |
| 618 stamp = xmlnode_get_attrib(y, "stamp"); | 618 stamp = xmlnode_get_attrib(y, "stamp"); |
| 619 } else if(!strcmp(y->name, "c") && !strcmp(xmlns, "http://jabber.org/protocol/caps")) { | 619 } else if(!strcmp(y->name, "c") && !strcmp(xmlns, "http://jabber.org/protocol/caps")) { |
| 620 caps = y; /* store for later, when creating buddy resource */ | 620 caps = y; /* store for later, when creating buddy resource */ |
| 621 } else if (g_str_equal(y->name, "nick") && g_str_equal(xmlns, "http://jabber.org/protocol/nick")) { | 621 } else if (g_str_equal(y->name, "nick") && g_str_equal(xmlns, "http://jabber.org/protocol/nick")) { |
| 622 nickname = xmlnode_get_data(y); | 622 nickname = xmlnode_get_data(y); |
| 623 } else if(!strcmp(y->name, "x")) { | 623 } else if(!strcmp(y->name, "x")) { |
| 624 if(!strcmp(xmlns, "http://jabber.org/protocol/muc#user")) { | 624 if(!strcmp(xmlns, "jabber:x:delay")) { |
| 625 /* XXX: compare the time. jabber:x:delay can happen on presence packets that aren't really and truly delayed */ | |
| 626 delayed = TRUE; | |
| 627 stamp = xmlnode_get_attrib(y, "stamp"); | |
| 628 } else if(!strcmp(xmlns, "http://jabber.org/protocol/muc#user")) { | |
| 625 } else if(!strcmp(xmlns, "vcard-temp:x:update")) { | 629 } else if(!strcmp(xmlns, "vcard-temp:x:update")) { |
| 626 xmlnode *photo = xmlnode_get_child(y, "photo"); | 630 xmlnode *photo = xmlnode_get_child(y, "photo"); |
| 627 if(photo) { | 631 if(photo) { |
| 628 g_free(avatar_hash); | 632 g_free(avatar_hash); |
| 629 avatar_hash = xmlnode_get_data(photo); | 633 avatar_hash = xmlnode_get_data(photo); |