From c18848c9b2eb8e19f9fb0d7057af09245a7336e7 Mon Sep 17 00:00:00 2001 From: Jameson Rollins Date: Mon, 4 Oct 2010 11:49:34 -0400 Subject: [PATCH] some improvements to the marginal ui prompt --- Crypt/Monkeysphere/MSVA/MarginalUI.pm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Crypt/Monkeysphere/MSVA/MarginalUI.pm b/Crypt/Monkeysphere/MSVA/MarginalUI.pm index 094f70c..843ff27 100755 --- a/Crypt/Monkeysphere/MSVA/MarginalUI.pm +++ b/Crypt/Monkeysphere/MSVA/MarginalUI.pm @@ -98,10 +98,12 @@ msvalog('info', "No valid certifiers, so no marginal UI\n"); } else { my $certifier_list = join("\n", map { sprintf("[%s] %s", $_->{key_id}, $_->{user_id}) } @valid_certifiers); - my $msg = sprintf("The matching key we found for [%s] is not %svalid.\n(Key Fingerprint: 0x%.40s)\n----\nBut it was certified by the following folks:\n%s", + my $msg = sprintf("The matching key for [%s] is not %svalid.\n----------\nhost: %s\nkey fingerprint: 0x%.40s\nvalidity: %s\n----------\nThe certificate is certified by the following people:\n\n%s\n\nWould you like to temporarily accept this certification?", $uid, ('m' == $keyfpr->{val} ? 'fully ' : ''), + $uid, $keyfpr->{fpr}->as_hex_string, + $keyfpr->{val}, $certifier_list, ); # FIXME: what about revoked certifications? @@ -126,10 +128,17 @@ Gtk2->init(); # create a new dialog with some buttons - one stock, one not. - my $dialog = Gtk2::Dialog->new ('msva-perl prompt!', undef, [], - 'gtk-cancel' => 'cancel', - 'Lemme at it!' => 'ok'); + my $dialog = Gtk2::Dialog->new('Monkeysphere validation agent', + undef, + [], + 'gtk-no' => 'cancel', + 'gtk-yes' => 'ok'); + + + my $label = Gtk2::Label->new($labeltxt); + # make the text in the dialog box selectable + $label->set('selectable', 1); $label->show(); $dialog->get_content_area()->add($label); my $resp = 0; -- 2.26.2