adium 2888:5ad0655bec90: im.pidgin.adium at 4186b63b5a916295647d...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/5ad0655bec90
revision:	2888:5ad0655bec90
author:		Zachary West <zacw at adium.im>
date:		Sat Nov 07 16:57:15 2009 -0500

im.pidgin.adium at 4186b63b5a916295647d8722226b8ee3125316f3

diffs (66 lines):

diff -r f046b16a0a17 -r 5ad0655bec90 Frameworks/libpurple.framework/Versions/0.6.4/Headers/jabber.h
--- a/Frameworks/libpurple.framework/Versions/0.6.4/Headers/jabber.h	Sat Nov 07 16:24:00 2009 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.6.4/Headers/jabber.h	Sat Nov 07 16:57:15 2009 -0500
@@ -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;
@@ -382,6 +373,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_ */
diff -r f046b16a0a17 -r 5ad0655bec90 Frameworks/libpurple.framework/Versions/0.6.4/Headers/oscar.h
--- a/Frameworks/libpurple.framework/Versions/0.6.4/Headers/oscar.h	Sat Nov 07 16:24:00 2009 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.6.4/Headers/oscar.h	Sat Nov 07 16:57:15 2009 -0500
@@ -623,7 +623,7 @@
 	} chat;
 };
 
-int oscar_connect_to_bos(PurpleConnection *gc, OscarData *od, const char *host, guint16 port, guint8 *cookie, guint16 cookielen);
+int oscar_connect_to_bos(PurpleConnection *gc, OscarData *od, const char *host, guint16 port, guint8 *cookie, guint16 cookielen, const char *tls_certname);
 
 /* family_auth.c */
 
diff -r f046b16a0a17 -r 5ad0655bec90 Frameworks/libpurple.framework/Versions/0.6.4/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.4/libpurple has changed