Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/xmpp.c @ 2152:2ce6dd6861ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the Carbons <private/> element for outgoing encrypted messages
author Mikael Berthe <mikael@lilotux.net>
date Sat, 04 Oct 2014 18:31:46 +0200
parents 8819bab88053
children a053629321ed
comparison
equal deleted inserted replaced
2151:8819bab88053 2152:2ce6dd6861ea
414 lm_message_node_set_attribute(y, "xmlns", NS_ENCRYPTED); 414 lm_message_node_set_attribute(y, "xmlns", NS_ENCRYPTED);
415 if (encrypted) 415 if (encrypted)
416 *encrypted = ENCRYPTED_PGP; 416 *encrypted = ENCRYPTED_PGP;
417 g_free(enc); 417 g_free(enc);
418 } 418 }
419
420 // We probably don't want Carbons for encrypted messages, since the other
421 // resources won't be able to decrypt them.
422 if (carbons_enabled())
423 lm_message_node_add_child(x->node, "private", NS_CARBONS_2);
419 424
420 // XEP-0184: Message Receipts 425 // XEP-0184: Message Receipts
421 if (sl_buddy && xep184 && 426 if (sl_buddy && xep184 &&
422 caps_has_feature(buddy_resource_getcaps(sl_buddy->data, rname), 427 caps_has_feature(buddy_resource_getcaps(sl_buddy->data, rname),
423 NS_RECEIPTS, barejid)) { 428 NS_RECEIPTS, barejid)) {