comparison libpurple/protocols/jabber/disco.c @ 18685:c03e3fe11ea9

Fixed errors created by merge conflict resolve mistakes.

18684:5c1ed6296b56

		/* If the server supports JABBER_CAP_GOOGLE_ROSTER; we will have already requested it */
		jabber_roster_request(js);
	}

	/* Send initial presence; this will trigger receipt of presence for contacts on the roster */
	gpresence = purple_account_get_presence(js->gc->account);
	status = purple_presence_get_active_status(gpresence);
	jabber_presence_send(js->gc->account, status);
	
	if (js->server_caps & JABBER_CAP_ADHOC) {
		/* The server supports ad-hoc commands, so let's request the list */
		jabber_adhoc_server_get_list(js);
	}

18685:c03e3fe11ea9

		/* If the server supports JABBER_CAP_GOOGLE_ROSTER; we will have already requested it */
		jabber_roster_request(js);
	}

	/* Send initial presence; this will trigger receipt of presence for contacts on the roster */
	jabber_presence_send(js->gc->account, NULL);
	
	if (js->server_caps & JABBER_CAP_ADHOC) {
		/* The server supports ad-hoc commands, so let's request the list */
		jabber_adhoc_server_get_list(js);
	}