Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.h @ 26552:4f14455a86d2
propagate from branch 'im.pidgin.pidgin' (head f25348fdce436002d7d508f074aaa70fd9491f01)
to branch 'im.pidgin.cpw.darkrain42.xmpp.iq-handlers' (head 33f84ea59a9e7afb3a03806268589ea49622326a)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 03 Apr 2009 16:45:38 +0000 |
parents | 439f07ce4c8a 34eb898478b4 |
children | 5767b7698c73 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.h Fri Apr 03 02:43:22 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.h Fri Apr 03 16:45:38 2009 +0000 @@ -54,8 +54,11 @@ #include "circbuffer.h" #include "connection.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" @@ -243,6 +246,15 @@ * for when we lookup buddy icons from a url */ GSList *url_datas; + + /* keep a hash table of JingleSessions */ + GHashTable *sessions; + + /* maybe this should only be present when USE_VV? */ + gchar *stun_ip; + int stun_port; + PurpleDnsQueryData *stun_query; + /* later add stuff to handle TURN relays... */ }; typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *shortname, const gchar *namespace); @@ -311,6 +323,9 @@ gboolean jabber_offline_message(const PurpleBuddy *buddy); int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len); GList *jabber_actions(PurplePlugin *plugin, gpointer context); +gboolean jabber_initiate_media(PurpleConnection *gc, const char *who, + PurpleMediaSessionType type); +PurpleMediaCaps jabber_get_media_caps(PurpleConnection *gc, const char *who); void jabber_register_commands(void); void jabber_init_plugin(PurplePlugin *plugin);