comparison libpurple/protocols/jabber/disco.c @ 18163:703872bf33c6

server-side jabber vcards now take precedence over local vcards, so we no longer overwrite things we shouldn't (fixes #1013)

18162:2b8460b599ea

}

static void
jabber_disco_finish_server_info_result_cb(JabberStream *js)
{
	if (!(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) {
		/* If the server supports JABBER_CAP_GOOGLE_ROSTER; we will have already requested it */
		jabber_roster_request(js);
	}

18163:703872bf33c6

}

static void
jabber_disco_finish_server_info_result_cb(JabberStream *js)
{

	jabber_vcard_fetch_mine(js);

	if (!(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) {
		/* If the server supports JABBER_CAP_GOOGLE_ROSTER; we will have already requested it */
		jabber_roster_request(js);
	}