comparison libgaim/protocols/jabber/disco.c @ 15261:b5dff06f9c84

[gaim-migrate @ 18051] Fixed retrieval of the roster for non-Google Talk Jabber accounts, which was broken in [17993]. This does not entirely fix the problem for such accounts, however; the roster is retrieved *after* we're told of presence for most/all of the roster. If GaimBuddy objects are not already created -- the blist.xml file was deleted, to pick a completely random example -- then such presence information is simply dropped, because jabber_presence_parse() uses gaim_find_buddy() and returns immediately if the buddy can't be found. committer: Tailor Script <tailor@pidgin.im>
author Evan Schoenberg <evan.s@dreskin.net>
date Mon, 25 Dec 2006 06:01:33 +0000
parents f814b2df9cce
children 8e39ca9b954a
comparison
equal deleted inserted replaced
15260:5176a9f30ba3 15261:b5dff06f9c84
266 js->server_caps |= JABBER_CAP_GOOGLE_ROSTER; 266 js->server_caps |= JABBER_CAP_GOOGLE_ROSTER;
267 jabber_google_roster_init(js); 267 jabber_google_roster_init(js);
268 } 268 }
269 } 269 }
270 270
271 if (!js->server_caps & JABBER_CAP_GOOGLE_ROSTER) 271 if (!(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
272 jabber_roster_request(js); 272 jabber_roster_request(js);
273 } 273 }
274 274
275 static void 275 static void
276 jabber_disco_server_items_result_cb(JabberStream *js, xmlnode *packet, gpointer data) 276 jabber_disco_server_items_result_cb(JabberStream *js, xmlnode *packet, gpointer data)