Mercurial > pidgin.yaz
diff 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)
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Sun, 17 Jun 2007 15:27:35 +0000 |
| parents | 7f23135d9b68 |
| children | c5c265dff90c |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/disco.c Sun Jun 17 15:09:05 2007 +0000 +++ b/libpurple/protocols/jabber/disco.c Sun Jun 17 15:27:35 2007 +0000 @@ -218,6 +218,9 @@ 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);