Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/xmpp.c @ 2155:a053629321ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Carbons: Fix check in changeset 2ce6dd6861ea
author Mikael Berthe <mikael@lilotux.net>
date Sat, 04 Oct 2014 18:49:52 +0200
parents 2ce6dd6861ea
children a54c084af4d6
comparison
equal deleted inserted replaced
2154:ccaa4f4c9151 2155:a053629321ed
417 g_free(enc); 417 g_free(enc);
418 } 418 }
419 419
420 // We probably don't want Carbons for encrypted messages, since the other 420 // We probably don't want Carbons for encrypted messages, since the other
421 // resources won't be able to decrypt them. 421 // resources won't be able to decrypt them.
422 if (carbons_enabled()) 422 if (enc && carbons_enabled())
423 lm_message_node_add_child(x->node, "private", NS_CARBONS_2); 423 lm_message_node_add_child(x->node, "private", NS_CARBONS_2);
424 424
425 // XEP-0184: Message Receipts 425 // XEP-0184: Message Receipts
426 if (sl_buddy && xep184 && 426 if (sl_buddy && xep184 &&
427 caps_has_feature(buddy_resource_getcaps(sl_buddy->data, rname), 427 caps_has_feature(buddy_resource_getcaps(sl_buddy->data, rname),