comparison libpurple/protocols/jabber/jabber.h @ 27056:c2cd559e034f

propagate from branch 'im.pidgin.pidgin' (head 97fbf033d9afea69a6eabaac94698b3c051584cf) to branch 'im.pidgin.cpw.darkrain42.xmpp.disco' (head d1274de628e3e7c76742ebf0941b7d104e19dceb)
author Paul Aurich <paul@darkrain42.org>
date Sat, 23 May 2009 22:46:28 +0000
parents a8537bbcfb79 5afee99de904
children 08964b4b2fe4
comparison
equal deleted inserted replaced
27024:7957a5ed53bb 27056:c2cd559e034f
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"
151 GList *chat_servers; 153 GList *chat_servers;
152 PurpleRoomlist *roomlist; 154 PurpleRoomlist *roomlist;
153 GList *user_directories; 155 GList *user_directories;
154 156
155 GHashTable *iq_callbacks; 157 GHashTable *iq_callbacks;
156 GHashTable *disco_callbacks;
157 int next_id; 158 int next_id;
158 159
159 GList *bs_proxies; 160 GList *bs_proxies;
160 GList *oob_file_transfers; 161 GList *oob_file_transfers;
161 GList *file_transfers; 162 GList *file_transfers;
266 /* maybe this should only be present when USE_VV? */ 267 /* maybe this should only be present when USE_VV? */
267 gchar *stun_ip; 268 gchar *stun_ip;
268 int stun_port; 269 int stun_port;
269 PurpleDnsQueryData *stun_query; 270 PurpleDnsQueryData *stun_query;
270 /* later add stuff to handle TURN relays... */ 271 /* later add stuff to handle TURN relays... */
272
273 /**
274 * The last server the user disco'd (or NULL) via the server discovery
275 * API.
276 */
277 char *last_disco_server;
271 }; 278 };
272 279
273 typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace); 280 typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace);
274 281
275 typedef struct _JabberFeature 282 typedef struct _JabberFeature