From: <ev...@us...> - 2006-12-25 06:01:34
|
Revision: 18051 http://svn.sourceforge.net/gaim/?rev=18051&view=rev Author: evands Date: 2006-12-24 22:01:33 -0800 (Sun, 24 Dec 2006) Log Message: ----------- 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. Modified Paths: -------------- trunk/libgaim/protocols/jabber/disco.c Modified: trunk/libgaim/protocols/jabber/disco.c =================================================================== --- trunk/libgaim/protocols/jabber/disco.c 2006-12-23 19:32:10 UTC (rev 18050) +++ trunk/libgaim/protocols/jabber/disco.c 2006-12-25 06:01:33 UTC (rev 18051) @@ -268,7 +268,7 @@ } } - if (!js->server_caps & JABBER_CAP_GOOGLE_ROSTER) + if (!(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) jabber_roster_request(js); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |