Merge branch 'master' into pgp

2015-03-29 00:59:42 +00:00
parent 0f6bc9b55d 714faeb2e6
commit c1eceebcba
11 changed files with 196 additions and 30 deletions
--- a/src/xmpp/stanza.h
+++ b/src/xmpp/stanza.h
@@ -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);