summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Aurich <darkrain42@pidgin.im>2009-11-07 04:41:04 +0000
committerPaul Aurich <darkrain42@pidgin.im>2009-11-07 04:41:04 +0000
commit2371f800cd0caf7639f5a3fb4af8d279942a27f7 (patch)
tree8b7078db4354877f85d4a81a5fe583423d51f946
parent86a8a71aea2fdb10adc3e89376c425932d0bd14c (diff)
downloadpidgin-2371f800cd0caf7639f5a3fb4af8d279942a27f7.tar.gz
jabber: did someone say something about the end of the struct?
Not sure what the original thinking was there (other than to have JabberStream be part of the public API?), but this is no longer accurate.
-rw-r--r--libpurple/protocols/jabber/jabber.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
index 7440e674e4..d25fa67fd9 100644
--- a/libpurple/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
@@ -193,25 +193,16 @@ struct _JabberStream
char *serverFQDN;
- /* OK, this stays at the end of the struct, so plugins can depend
- * on the rest of the stuff being in the right place
- */
#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
- /* did someone say something about the end of the struct? */
-#ifdef HAVE_CYRUS_SASL
const char *current_mech;
int auth_fail_count;
-#endif
int sasl_state;
int sasl_maxbuf;
GString *sasl_mechs;
+#endif
gboolean unregistration;
PurpleAccountUnregistrationCb unregistration_cb;