Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/xmpp.c @ 2192:cb53950fb1de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not use <private> for PGP-encrypted outgoing messages
author Holger Weiß <holger@zedat.fu-berlin.de>
date Sun, 04 Oct 2015 21:30:41 +0200
parents ee3a40ffcd8b
children f4c00c72b27d
comparison
equal deleted inserted replaced
2191:025cd2af5fbb 2192:cb53950fb1de
420 g_free(enc); 420 g_free(enc);
421 } 421 }
422 422
423 // We probably don't want Carbons for encrypted messages, since the other 423 // We probably don't want Carbons for encrypted messages, since the other
424 // resources won't be able to decrypt them. 424 // resources won't be able to decrypt them.
425 if (enc && carbons_enabled()) 425 if (otr_msg && carbons_enabled())
426 lm_message_node_add_child(x->node, "private", NS_CARBONS_2); 426 lm_message_node_add_child(x->node, "private", NS_CARBONS_2);
427 427
428 // XEP-0184: Message Receipts 428 // XEP-0184: Message Receipts
429 if (sl_buddy && xep184 && 429 if (sl_buddy && xep184 &&
430 caps_has_feature(buddy_resource_getcaps(sl_buddy->data, rname), 430 caps_has_feature(buddy_resource_getcaps(sl_buddy->data, rname),