Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.h @ 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 | 547c76fe2e7a |
| children | 5c1ed6296b56 67cb28c0ec89 315151da0dc6 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.h Sun Jun 17 15:09:05 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.h Sun Jun 17 15:27:35 2007 +0000 @@ -142,11 +142,17 @@ #ifdef HAVE_CYRUS_SASL sasl_conn_t *sasl; sasl_callback_t *sasl_cb; +#else /* keep the struct the same size */ + void *sasl; + void *sasl_cb; +#endif + int sasl_state; int sasl_maxbuf; GString *sasl_mechs; char *serverFQDN; -#endif + + gboolean vcard_fetched; } JabberStream;