Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.h @ 26675:b290c7b9fc73
propagate from branch 'im.pidgin.pidgin' (head 3c568b43fb4447b65a2b06e6767340edd7763c53)
to branch 'org.darkrain42.pidgin.disco' (head ead0d4fe7ad002d288919e966edd3a24ef98edfc)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 09 Apr 2009 04:27:58 +0000 |
| parents | 5767b7698c73 f5e613e05332 |
| children | 4851546210a1 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.h Thu Apr 09 01:59:24 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.h Thu Apr 09 04:27:58 2009 +0000 @@ -44,6 +44,8 @@ JABBER_CAP_ADHOC = 1 << 12, JABBER_CAP_BLOCKING = 1 << 13, + JABBER_CAP_ITEMS = 1 << 14, + JABBER_CAP_RETRIEVED = 1 << 31 } JabberCapabilities; @@ -53,12 +55,12 @@ #include <glib.h> #include "circbuffer.h" #include "connection.h" +#include "dnsquery.h" #include "dnssrv.h" #include "media.h" #include "mediamanager.h" #include "roomlist.h" #include "sslconn.h" -#include "dnsquery.h" #include "iq.h" #include "jutil.h" @@ -255,6 +257,12 @@ int stun_port; PurpleDnsQueryData *stun_query; /* later add stuff to handle TURN relays... */ + + /** + * The last server the user disco'd (or NULL) via the server discovery + * API. + */ + char *last_disco_server; }; typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *shortname, const gchar *namespace);