Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.h @ 26970:413006df9828
propagate from branch 'im.pidgin.pidgin' (head 13ac492a493b4d31c8b29905174b43a533304300)
to branch 'im.pidgin.cpw.darkrain42.xmpp.disco' (head e73974597bbcc75504a88eac45d6893c182d058e)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 29 Apr 2009 23:20:51 +0000 |
| parents | 3912f55a1633 1df3579a974b |
| children | 5afee99de904 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.h Wed Apr 29 17:50:14 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.h Wed Apr 29 23:20:51 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" @@ -151,7 +153,6 @@ GList *user_directories; GHashTable *iq_callbacks; - GHashTable *disco_callbacks; int next_id; GList *bs_proxies; @@ -266,6 +267,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 *namespace);