cpw.darkrain42.xmpp.bosh: b3b179b8: Wait until receiving the roster to tell ...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: b3b179b8def361326c66b090679e52804802631e
Ancestor: f035dc8fbc4edff4b285a7bea53adb14a15a5e31
Author: paul at darkrain42.org
Date: 2009-02-10T04:43:50
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/b3b179b8def361326c66b090679e52804802631e

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/roster.c

ChangeLog: 

Wait until receiving the roster to tell the core we're logged in

References #8385 (hopefully, this cures it, but I'm not sure).

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	9177ad5e015c0078146327fdb681b378dab7cfe9
+++ libpurple/protocols/jabber/jabber.c	96a250a0fb45fe0490de58b38887df5413f178be
@@ -92,7 +92,7 @@ jabber_session_initialized_cb(JabberStre
 {
 	const char *type = xmlnode_get_attrib(packet, "type");
 	if(type && !strcmp(type, "result")) {
-		jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
+		jabber_disco_items_server(js);
 		if(js->unregistration)
 			jabber_unregister_account_cb(js);
 	} else {
@@ -1527,7 +1527,6 @@ void jabber_stream_set_state(JabberStrea
 		case JABBER_STREAM_CONNECTED:
 			/* now we can alert the core that we're ready to send status */
 			purple_connection_set_state(js->gc, PURPLE_CONNECTED);
-			jabber_disco_items_server(js);
 			break;
 	}
 }
============================================================
--- libpurple/protocols/jabber/roster.c	902db55cf63902b43d6d30046db76ab92359851c
+++ libpurple/protocols/jabber/roster.c	8c7b5275f5e4df3de2725b1e97a8106aa043d980
@@ -257,10 +257,11 @@ void jabber_roster_parse(JabberStream *j
 	js->currently_parsing_roster_push = FALSE;
 
 	/* if we're just now parsing the roster for the first time,
-	 * then now would be the time to send our initial presence */
+	 * then now would be the time to declare ourselves connected and
+	 * send our initial presence */
 	if(!js->roster_parsed) {
 		js->roster_parsed = TRUE;
-
+		jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
 		jabber_presence_send(js, TRUE);
 	}
 }