pidgin: 122c09fb: jabber: did someone say something about ...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 122c09fb418ceb629bb942da06d3a45a22f19680
Ancestor: c3be7591114fdb749db60b5a72647b3fdd8e6e9e
Author: darkrain42 at pidgin.im
Date: 2009-11-07T04:41:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/122c09fb418ceb629bb942da06d3a45a22f19680

Modified files:
        libpurple/protocols/jabber/jabber.h

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.h	1b99b42b03fc5ed9ecf6a64ab3cd60e9e2091376
+++ libpurple/protocols/jabber/jabber.h	ac103a30f7f417d8d67656982049ecde5f6cf545
@@ -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;