Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/xmpp.c @ 2194:f4c00c72b27d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation when OTR is disabled
author Mikael Berthe <mikael@lilotux.net>
date Tue, 06 Oct 2015 21:16:41 +0200
parents cb53950fb1de
children 40ddaebeb81e
comparison
equal deleted inserted replaced
2193:18fa5ecb1ef4 2194:f4c00c72b27d
418 if (encrypted) 418 if (encrypted)
419 *encrypted = ENCRYPTED_PGP; 419 *encrypted = ENCRYPTED_PGP;
420 g_free(enc); 420 g_free(enc);
421 } 421 }
422 422
423 #ifdef HAVE_LIBOTR
423 // We probably don't want Carbons for encrypted messages, since the other 424 // We probably don't want Carbons for encrypted messages, since the other
424 // resources won't be able to decrypt them. 425 // resources won't be able to decrypt them.
425 if (otr_msg && carbons_enabled()) 426 if (otr_msg && carbons_enabled())
426 lm_message_node_add_child(x->node, "private", NS_CARBONS_2); 427 lm_message_node_add_child(x->node, "private", NS_CARBONS_2);
428 #endif
427 429
428 // XEP-0184: Message Receipts 430 // XEP-0184: Message Receipts
429 if (sl_buddy && xep184 && 431 if (sl_buddy && xep184 &&
430 caps_has_feature(buddy_resource_getcaps(sl_buddy->data, rname), 432 caps_has_feature(buddy_resource_getcaps(sl_buddy->data, rname),
431 NS_RECEIPTS, barejid)) { 433 NS_RECEIPTS, barejid)) {