libpurple/protocols/jabber/jabber.h

branch
next.minor
changeset 29665
ddf17c6b7fed
parent 29096
362b96f6f3da
child 29370
9ff8f3bdd0f5
child 29470
131f66d844dc
--- a/libpurple/protocols/jabber/jabber.h	Mon Nov 30 06:24:32 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Wed Dec 09 03:52:00 2009 +0000
@@ -47,6 +47,7 @@
 	JABBER_CAP_BLOCKING       = 1 << 13,
 
 	JABBER_CAP_ITEMS          = 1 << 14,
+	JABBER_CAP_ROSTER_VERSIONING = 1 << 15,
 
 	JABBER_CAP_RETRIEVED      = 1 << 31
 } JabberCapabilities;
@@ -66,6 +67,7 @@
 
 #include "namespaces.h"
 
+#include "auth.h"
 #include "iq.h"
 #include "jutil.h"
 #include "xmlnode.h"
@@ -106,13 +108,9 @@
 		JABBER_PROTO_0_9,
 		JABBER_PROTO_1_0
 	} protocol_version;
-	enum {
-		JABBER_AUTH_UNKNOWN,
-		JABBER_AUTH_DIGEST_MD5,
-		JABBER_AUTH_PLAIN,
-		JABBER_AUTH_IQ_AUTH,
-		JABBER_AUTH_CYRUS
-	} auth_type;
+
+	JabberSaslMech *auth_mech;
+	gpointer auth_mech_data;
 	char *stream_id;
 	JabberStreamState state;
 

mercurial