[openpgp-applet] 25/61: Don't pass already encoded data to GTK2.

[Clément Hermann]

This is an automated email from the git hooks/post-receive script.

nodens-guest pushed a commit to annotated tag OpenPGP_Applet-0.9
in repository openpgp-applet.

commit af1dfff0cabb706d255fedfc45fef0baef35d8c7
Author: Clément Hermann (nodens) <nodens at nodens.org>
Date:   Tue Nov 11 18:18:15 2014 +0100

    Don't pass already encoded data to GTK2.
    
    ... Or it will be encoded twice.
    This fixes #7968 - "Tails OpenPGP Applet can't clearsign text including
    non-ASCII characters"
    Only affects clearsign, as PGP armored data is always ASCII.
---
 bin/openpgp-applet | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/openpgp-applet b/bin/openpgp-applet
index 3c72633..6958d30 100755
--- a/bin/openpgp-applet
+++ b/bin/openpgp-applet
@@ -306,9 +306,10 @@ sub set_clipboards_text {
     # is supposed to need input encoded in UTF-8. But it seems like the Perl
     # bindings encode it, and we need to pass a string of chars instead of bytes.
     foreach (all_clipboards()) {
-        $_->set_text($encoded_text);
+        $_->set_text($text);
     }
     # GTK fails setting the primary selection above, so let's use xclip :/
+	# xclip needs encoded text.
     open(my $xclip, '|-', 'xclip') or die "Error opening pipe to xclip";
     print $xclip $encoded_text or die "Error copying data to X clipboard";
     close $xclip or die "Error closing pipe to xclip";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/openpgp-applet.git