Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/xmpp.c @ 2188:84252c616919

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PGP: Encrypt messages with our own PGP key when carbons are enabled
author Mikael Berthe <mikael@lilotux.net>
date Sun, 04 Oct 2015 19:04:43 +0200
parents e3b66c8ead4f
children 3b91f6a100f5
comparison
equal deleted inserted replaced
2187:e3b66c8ead4f 2188:84252c616919
381 const char *key; 381 const char *key;
382 key = settings_pgp_getkeyid(barejid); 382 key = settings_pgp_getkeyid(barejid);
383 if (!key && res_pgpdata) 383 if (!key && res_pgpdata)
384 key = res_pgpdata->sign_keyid; 384 key = res_pgpdata->sign_keyid;
385 if (key) { 385 if (key) {
386 const char *keys[] = { key }; 386 int nkeys = 1;
387 enc = gpg_encrypt(text, keys, 1); 387 const char *keys[] = { key, 0 };
388 if (carbons_enabled()) {
389 keys[1] = gpg_get_private_key_id();
390 nkeys++;
391 }
392 enc = gpg_encrypt(text, keys, nkeys);
388 } 393 }
389 if (!enc && force) { 394 if (!enc && force) {
390 if (encrypted) 395 if (encrypted)
391 *encrypted = -1; 396 *encrypted = -1;
392 g_free(barejid); 397 g_free(barejid);