Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.h @ 25718:4bc74deeb503
propagate from branch 'im.pidgin.pidgin' (head 434563a4b8fadb9593c241db4bb5ffd0bf2c0627)
to branch 'im.pidgin.soc.2008.vv' (head 59d05cb38af9346d82ce57477273f7b381054bcc)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sat, 09 Aug 2008 02:24:38 +0000 |
| parents | 9bf36aad8735 e73b03097664 |
| children | 551a462b346a |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.h Fri Aug 08 23:34:27 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.h Sat Aug 09 02:24:38 2008 +0000 @@ -53,6 +53,8 @@ #include "circbuffer.h" #include "connection.h" #include "dnssrv.h" +#include "media.h" +#include "mediamanager.h" #include "roomlist.h" #include "sslconn.h" @@ -236,6 +238,11 @@ PurpleSrvResponse *srv_rec; guint srv_rec_idx; guint max_srv_rec_idx; + +#ifdef USE_VV + /* keep a hash table of JingleSessions */ + GHashTable *sessions; +#endif }; typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *shortname, const gchar *namespace); @@ -303,4 +310,9 @@ void jabber_register_commands(void); void jabber_init_plugin(PurplePlugin *plugin); +#ifdef USE_VV +PurpleMedia *jabber_initiate_media(PurpleConnection *gc, const char *who, PurpleMediaStreamType type); +gboolean jabber_can_do_media(PurpleConnection *gc, const char *who, PurpleMediaStreamType type); +#endif + #endif /* _PURPLE_JABBER_H_ */