Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.h Wed Sep 01 17:55:14 2010 +0000 +++ b/libpurple/protocols/jabber/jabber.h Wed Sep 01 18:41:53 2010 +0000 @@ -276,7 +276,12 @@ gchar *stun_ip; int stun_port; PurpleDnsQueryData *stun_query; - /* later add stuff to handle TURN relays... */ + + /* stuff for Google's relay handling */ + gchar *google_relay_token; + gchar *google_relay_host; + GList *google_relay_requests; /* the HTTP requests to get */ + /* relay info */ }; typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace);