devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-28 21:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pgp

Browse Source
This commit is contained in:
James Booth
2015-05-04 21:31:22 +01:00
parent a5677206e9 a0c872edf8
commit 65ea572dae
1 changed files with 55 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/xmpp/message.c
View File

@@ -638,18 +638,14 @@ _private_chat_handler(xmpp_stanza_t * const stanza, const char * const fulljid)
xmpp_free(ctx, message); xmpp_free(ctx, message);
} }
static int static gboolean
_chat_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata) _handle_carbons(xmpp_stanza_t * const stanza)
{ {
// ignore if type not chat or absent xmpp_stanza_t *carbons = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_CARBONS);
char *type = xmpp_stanza_get_type(stanza); if (!carbons) {
if (!(g_strcmp0(type, "chat") == 0 || type == NULL)) { return FALSE;
return 1;
} }
// 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); char *name = xmpp_stanza_get_name(carbons);
if ((g_strcmp0(name, "received") == 0) || (g_strcmp0(name, "sent")) == 0) { if ((g_strcmp0(name, "received") == 0) || (g_strcmp0(name, "sent")) == 0) {
xmpp_stanza_t *forwarded = xmpp_stanza_get_child_by_ns(carbons, STANZA_NS_FORWARD); xmpp_stanza_t *forwarded = xmpp_stanza_get_child_by_ns(carbons, STANZA_NS_FORWARD);
@@ -687,8 +683,26 @@ _chat_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * con
jid_destroy(jid_from); jid_destroy(jid_from);
jid_destroy(jid_to); jid_destroy(jid_to);
jid_destroy(my_jid); jid_destroy(my_jid);
return TRUE;
}
return FALSE;
}
static int
_chat_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata)
{
// ignore if type not chat or absent
char *type = xmpp_stanza_get_type(stanza);
if (!(g_strcmp0(type, "chat") == 0 || type == NULL)) {
return 1; return 1;
} }
// check if carbon message
gboolean res = _handle_carbons(stanza);
if (res) {
return 1;
} }
// ignore handled namespaces // ignore handled namespaces