Mercurial > pidgin
comparison libpurple/protocols/jabber/jabber.h @ 18929:67cb28c0ec89
applied changes from e52b685d84ca8874da6e3e71199829e513500642
through 504a3dc38ec168dab1f4443c13d14858db47cd70
- Pulling the ssl_connect_with_host_fd change from soc.2007.xmpp
| author | William Ehlhardt <williamehlhardt@gmail.com> |
|---|---|
| date | Thu, 21 Jun 2007 19:21:47 +0000 |
| parents | 703872bf33c6 |
| children | 44b4e8bd759b 1d2002a5735e |
comparison
equal
deleted
inserted
replaced
| 18928:299022c9b32d | 18929:67cb28c0ec89 |
|---|---|
| 134 char *server_name; | 134 char *server_name; |
| 135 | 135 |
| 136 char *gmail_last_time; | 136 char *gmail_last_time; |
| 137 char *gmail_last_tid; | 137 char *gmail_last_tid; |
| 138 | 138 |
| 139 char *serverFQDN; | |
| 140 | |
| 139 /* OK, this stays at the end of the struct, so plugins can depend | 141 /* OK, this stays at the end of the struct, so plugins can depend |
| 140 * on the rest of the stuff being in the right place | 142 * on the rest of the stuff being in the right place |
| 141 */ | 143 */ |
| 142 #ifdef HAVE_CYRUS_SASL | 144 #ifdef HAVE_CYRUS_SASL |
| 143 sasl_conn_t *sasl; | 145 sasl_conn_t *sasl; |
| 148 #endif | 150 #endif |
| 149 | 151 |
| 150 int sasl_state; | 152 int sasl_state; |
| 151 int sasl_maxbuf; | 153 int sasl_maxbuf; |
| 152 GString *sasl_mechs; | 154 GString *sasl_mechs; |
| 153 char *serverFQDN; | |
| 154 | 155 |
| 155 gboolean vcard_fetched; | 156 gboolean vcard_fetched; |
| 156 | 157 |
| 157 } JabberStream; | 158 } JabberStream; |
| 158 | 159 |