Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/roster.c @ 26569:bc7fac8e2f79
propagate from branch 'im.pidgin.pidgin' (head f144c6bda9daf701aa891c875fce7a4dedd611ae)
to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh' (head 8b60514f2b44295e87ee3587669aec5059556149)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 05 Apr 2009 21:13:10 +0000 |
| parents | c4fd9222dda1 439f07ce4c8a |
| children | a500f65bd077 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/roster.c Sun Apr 05 03:25:00 2009 +0000 +++ b/libpurple/protocols/jabber/roster.c Sun Apr 05 21:13:10 2009 +0000 @@ -145,10 +145,10 @@ g_slist_free(buddies); } -void jabber_roster_parse(JabberStream *js, xmlnode *packet) +void jabber_roster_parse(JabberStream *js, const char *from, + JabberIqType type, const char *id, xmlnode *query) { - xmlnode *query, *item, *group; - const char *from = xmlnode_get_attrib(packet, "from"); + xmlnode *item, *group; if(from) { char *from_norm; @@ -169,10 +169,6 @@ return; } - query = xmlnode_get_child(packet, "query"); - if(!query) - return; - js->currently_parsing_roster_push = TRUE; for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item))