[Pgp-tools-commit] r881 - in trunk: caff debian

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-09-30 11:12:12 +0000 (Fri, 30 Sep 2016)
New Revision: 881

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
List all UIDs contained in an email when asking whether to send it.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-09-17 19:58:58 UTC (rev 880)
+++ trunk/caff/caff	2016-09-30 11:12:12 UTC (rev 881)
@@ -1990,7 +1990,11 @@
 
             my $mail = create_mail($uid->{address}, $can_encrypt, $longkeyid, @keys);
             if (defined $mail) {
-                my $text = defined $LOCALE ? $LOCALE->encode($uid->{text}) : $uid->{text};
+                my @sentuids = map {$_->{text}} @attached;
+                unshift @sentuids, $uid->{text} if $uid->{export};
+                do { $_ = $LOCALE->encode($_) foreach @sentuids; } if defined $LOCALE;
+                my $text = join(', ', map {"'$_'"} @sentuids);
+
                 my $should_send_mail = ask("Mail ".($can_encrypt ? '' : '*unencrypted* ')."signature for $text to '$uid->{address}'?",
                                            $sendmail ne 'ask-no', $sendmail eq 'yes', $sendmail eq 'no');
                 send_message($mail) if $should_send_mail;

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2016-09-17 19:58:58 UTC (rev 880)
+++ trunk/debian/changelog	2016-09-30 11:12:12 UTC (rev 881)
@@ -6,6 +6,7 @@
       Kavanagh's blog post.
     + Fix regression (introduced in 2.4-1) skipping --recv-key when
       'keys-from-gnupg' isn't set.  (Closes: #837406)
+    + List all UIDs contained in an email when asking whether to send it.
   * gpg-key2latex: Add an option '--qrcode-data' to specify the data to encode
     in a QR code (default: "OPENPGP4FPR:%f").
   * gpg-key2ps: