Mercurial > ~mikael > mcabber > hg

diff 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
line wrap: on
line diff
--- a/mcabber/mcabber/xmpp.c	Sun Oct 04 19:04:04 2015 +0200
+++ b/mcabber/mcabber/xmpp.c	Sun Oct 04 19:04:43 2015 +0200
@@ -383,8 +383,13 @@
         if (!key && res_pgpdata)
           key = res_pgpdata->sign_keyid;
         if (key) {
-          const char *keys[] = { key };
-          enc = gpg_encrypt(text, keys, 1);
+          int nkeys = 1;
+          const char *keys[] = { key, 0 };
+          if (carbons_enabled()) {
+            keys[1] = gpg_get_private_key_id();
+            nkeys++;
+          }
+          enc = gpg_encrypt(text, keys, nkeys);
         }
         if (!enc && force) {
           if (encrypted)