# HG changeset patch # User Evan Schoenberg # Date 1167026493 0 # Node ID b5dff06f9c8407dfcc59934532b4efc4479ef430 # Parent 5176a9f30ba3c4e3265b93116a3780c6f2466448 [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 diff -r 5176a9f30ba3 -r b5dff06f9c84 libgaim/protocols/jabber/disco.c --- a/libgaim/protocols/jabber/disco.c Sat Dec 23 19:32:10 2006 +0000 +++ b/libgaim/protocols/jabber/disco.c Mon Dec 25 06:01:33 2006 +0000 @@ -268,7 +268,7 @@ } } - if (!js->server_caps & JABBER_CAP_GOOGLE_ROSTER) + if (!(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) jabber_roster_request(js); }