--- a/libpurple/protocols/jabber/jabber.h Tue Nov 03 18:26:29 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.h Mon Nov 09 19:01:03 2009 +0000
@@ -76,11 +76,11 @@
#define CAPS0115_NODE "http://pidgin.im/"
+#define JABBER_DEFAULT_REQUIRE_TLS TRUE
+
/* Index into attention_types list */
#define JABBER_BUZZ 0
-extern PurplePlugin *jabber_plugin;
-
typedef enum {
JABBER_STREAM_OFFLINE,
JABBER_STREAM_CONNECTING,
@@ -193,25 +193,16 @@
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;
@@ -387,6 +378,6 @@
void jabber_unregister_commands(void);
void jabber_init_plugin(PurplePlugin *plugin);
-void jabber_uninit_plugin(void);
+void jabber_uninit_plugin(PurplePlugin *plugin);
#endif /* PURPLE_JABBER_H_ */