Merge branch 'master' into pgp

This commit is contained in:
James Booth
2015-03-29 00:59:42 +00:00
11 changed files with 196 additions and 30 deletions

View File

@@ -217,6 +217,8 @@ xmpp_stanza_t* stanza_create_disco_info_iq(xmpp_ctx_t *ctx, const char * const i
xmpp_stanza_t* stanza_create_invite(xmpp_ctx_t *ctx, const char * const room,
const char * const contact, const char * const reason);
xmpp_stanza_t* stanza_create_mediated_invite(xmpp_ctx_t *ctx, const char * const room,
const char * const contact, const char * const reason);
gboolean stanza_contains_chat_state(xmpp_stanza_t *stanza);