Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/jabber.h @ 30961:356a8d472395
propagate from branch 'im.pidgin.pidgin' (head 947bfbeaa5e5a82ae69f2f3d36e34af9c15e24df)
to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head fedd5136b6592607c51921ec43a7d6fe5741f5a5)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Wed, 01 Sep 2010 18:41:53 +0000 |
| parents | 8084631e2e84 f01d73b4452e |
| children | 53dcfcc71953 |
comparison
equal
deleted
inserted
replaced
| 30911:75460aee9279 | 30961:356a8d472395 |
|---|---|
| 274 | 274 |
| 275 /* maybe this should only be present when USE_VV? */ | 275 /* maybe this should only be present when USE_VV? */ |
| 276 gchar *stun_ip; | 276 gchar *stun_ip; |
| 277 int stun_port; | 277 int stun_port; |
| 278 PurpleDnsQueryData *stun_query; | 278 PurpleDnsQueryData *stun_query; |
| 279 /* later add stuff to handle TURN relays... */ | 279 |
| 280 /* stuff for Google's relay handling */ | |
| 281 gchar *google_relay_token; | |
| 282 gchar *google_relay_host; | |
| 283 GList *google_relay_requests; /* the HTTP requests to get */ | |
| 284 /* relay info */ | |
| 280 }; | 285 }; |
| 281 | 286 |
| 282 typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace); | 287 typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace); |
| 283 | 288 |
| 284 typedef struct _JabberFeature | 289 typedef struct _JabberFeature |