comparison 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
comparison
equal deleted inserted replaced
26754:836a36564ff5 26970:413006df9828
42 42
43 JABBER_CAP_PING = 1 << 11, 43 JABBER_CAP_PING = 1 << 11,
44 JABBER_CAP_ADHOC = 1 << 12, 44 JABBER_CAP_ADHOC = 1 << 12,
45 JABBER_CAP_BLOCKING = 1 << 13, 45 JABBER_CAP_BLOCKING = 1 << 13,
46 46
47 JABBER_CAP_ITEMS = 1 << 14,
48
47 JABBER_CAP_RETRIEVED = 1 << 31 49 JABBER_CAP_RETRIEVED = 1 << 31
48 } JabberCapabilities; 50 } JabberCapabilities;
49 51
50 typedef struct _JabberStream JabberStream; 52 typedef struct _JabberStream JabberStream;
51 53
52 #include <libxml/parser.h> 54 #include <libxml/parser.h>
53 #include <glib.h> 55 #include <glib.h>
54 #include "circbuffer.h" 56 #include "circbuffer.h"
55 #include "connection.h" 57 #include "connection.h"
58 #include "dnsquery.h"
56 #include "dnssrv.h" 59 #include "dnssrv.h"
57 #include "media.h" 60 #include "media.h"
58 #include "mediamanager.h" 61 #include "mediamanager.h"
59 #include "roomlist.h" 62 #include "roomlist.h"
60 #include "sslconn.h" 63 #include "sslconn.h"
61 #include "dnsquery.h"
62 64
63 #include "iq.h" 65 #include "iq.h"
64 #include "jutil.h" 66 #include "jutil.h"
65 #include "xmlnode.h" 67 #include "xmlnode.h"
66 #include "buddy.h" 68 #include "buddy.h"
149 GList *chat_servers; 151 GList *chat_servers;
150 PurpleRoomlist *roomlist; 152 PurpleRoomlist *roomlist;
151 GList *user_directories; 153 GList *user_directories;
152 154
153 GHashTable *iq_callbacks; 155 GHashTable *iq_callbacks;
154 GHashTable *disco_callbacks;
155 int next_id; 156 int next_id;
156 157
157 GList *bs_proxies; 158 GList *bs_proxies;
158 GList *oob_file_transfers; 159 GList *oob_file_transfers;
159 GList *file_transfers; 160 GList *file_transfers;
264 /* maybe this should only be present when USE_VV? */ 265 /* maybe this should only be present when USE_VV? */
265 gchar *stun_ip; 266 gchar *stun_ip;
266 int stun_port; 267 int stun_port;
267 PurpleDnsQueryData *stun_query; 268 PurpleDnsQueryData *stun_query;
268 /* later add stuff to handle TURN relays... */ 269 /* later add stuff to handle TURN relays... */
270
271 /**
272 * The last server the user disco'd (or NULL) via the server discovery
273 * API.
274 */
275 char *last_disco_server;
269 }; 276 };
270 277
271 typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace); 278 typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace);
272 279
273 typedef struct _JabberFeature 280 typedef struct _JabberFeature