Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
26545:b01e8e76c59d | 26569:bc7fac8e2f79 |
---|---|
143 | 143 |
144 g_free(my_bare_jid); | 144 g_free(my_bare_jid); |
145 g_slist_free(buddies); | 145 g_slist_free(buddies); |
146 } | 146 } |
147 | 147 |
148 void jabber_roster_parse(JabberStream *js, xmlnode *packet) | 148 void jabber_roster_parse(JabberStream *js, const char *from, |
149 { | 149 JabberIqType type, const char *id, xmlnode *query) |
150 xmlnode *query, *item, *group; | 150 { |
151 const char *from = xmlnode_get_attrib(packet, "from"); | 151 xmlnode *item, *group; |
152 | 152 |
153 if(from) { | 153 if(from) { |
154 char *from_norm; | 154 char *from_norm; |
155 gboolean invalid; | 155 gboolean invalid; |
156 | 156 |
166 g_free(from_norm); | 166 g_free(from_norm); |
167 | 167 |
168 if(invalid) | 168 if(invalid) |
169 return; | 169 return; |
170 } | 170 } |
171 | |
172 query = xmlnode_get_child(packet, "query"); | |
173 if(!query) | |
174 return; | |
175 | 171 |
176 js->currently_parsing_roster_push = TRUE; | 172 js->currently_parsing_roster_push = TRUE; |
177 | 173 |
178 for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item)) | 174 for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item)) |
179 { | 175 { |