devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 10 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into xep-0184

Browse Source 
Conflicts:
	src/xmpp/message.c
This commit is contained in:
James Booth
2015-03-14 16:41:40 +00:00
parent 1014244408 2fc7937dcd
commit 060dcc24e3
1 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/xmpp/message.c
View File

@@ -525,6 +525,8 @@ _chat_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
// check if carbon message
xmpp_stanza_t *carbons = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_CARBONS);
if(carbons) {
char *name = xmpp_stanza_get_name(carbons);
if (g_strcmp0(name, "received") == 0) {
xmpp_stanza_t *forwarded = xmpp_stanza_get_child_by_ns(carbons, STANZA_NS_FORWARD);
xmpp_stanza_t *message = xmpp_stanza_get_child_by_name(forwarded, STANZA_NAME_MESSAGE);
@@ -564,6 +566,7 @@ _chat_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
jid_destroy(my_jid);
return 1;
}
}
// ignore handled namespaces
xmpp_stanza_t *conf = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_CONFERENCE);