From 3662f0bb2980f5ad9c7ac1e5cd52672ad5c20aeb Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 6 Oct 2010 22:59:15 -0400
Subject: [PATCH] more cleanup on prompt info

---
 Crypt/Monkeysphere/MSVA/MarginalUI.pm |  34 ++++++++++++++++++++------
 monkeysphere-icon.png                 | Bin 0 -> 937 bytes
 2 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 monkeysphere-icon.png

diff --git a/Crypt/Monkeysphere/MSVA/MarginalUI.pm b/Crypt/Monkeysphere/MSVA/MarginalUI.pm
index 843ff27..12a7bb3 100755
--- a/Crypt/Monkeysphere/MSVA/MarginalUI.pm
+++ b/Crypt/Monkeysphere/MSVA/MarginalUI.pm
@@ -94,23 +94,33 @@
           # We now know the list of fully/ultimately-valid
           # certifiers, and a separate list of marginally-valid
           # certifiers.
-          if ($#valid_certifiers == -1) {
+          if ($#valid_certifiers < -1) {
             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 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?",
+            my $msg = sprintf("The matching key for [%s] is not %svalid.
+----------
+The certificate is certified by:
+
+%s
+
+Would you like to temporarily accept this certification?",
                               $uid,
                               ('m' == $keyfpr->{val} ? 'fully ' : ''),
-			      $uid,
-                              $keyfpr->{fpr}->as_hex_string,
-			      $keyfpr->{val},
                               $certifier_list,
                              );
+            my $tip = sprintf("Peer: %s
+Key fingerprint: 0x%.40s
+GnuPG calculated validity: %s",
+			      $uid,
+                              $keyfpr->{fpr}->as_hex_string,
+			      $keyfpr->{val});
             # FIXME: what about revoked certifications?
             # FIXME: what about expired certifications?
             # FIXME: what about certifications ostensibly made in the future?
             msvalog('info', "%s\n", $msg);
-            my $resp = prompt($msg);
+            msvalog('verbose', "%s\n", $tip);
+            my $resp = prompt($uid, $msg, $tip);
             if ($resp) {
               return $resp;
             }
@@ -124,11 +134,13 @@
   }
 
   sub prompt {
+    my $peer = shift;
     my $labeltxt = shift;
+    my $tip = shift;
 
     Gtk2->init();
     # create a new dialog with some buttons - one stock, one not.
-    my $dialog = Gtk2::Dialog->new('Monkeysphere validation agent',
+    my $dialog = Gtk2::Dialog->new(sprintf('Monkeysphere validation agent [%s]', $peer),
 				    undef,
 				    [],
 				    'gtk-no' => 'cancel',
@@ -140,10 +152,16 @@
     # make the text in the dialog box selectable
     $label->set('selectable', 1);
     $label->show();
+    my $tooltips = Gtk2::Tooltips->new();
+    $tooltips->set_tip($label, $tip);
     $dialog->get_content_area()->add($label);
     my $resp = 0;
 
-    $dialog->set_default_response ('cancel');
+    my $icon_file = '/usr/share/pixmaps/monkeysphere-icon.png';
+
+    $dialog->set_default_icon_from_file($icon_file)
+      if (-r $icon_file);
+    $dialog->set_default_response('cancel');
 
     my $response = $dialog->run();
     if ($response eq 'ok') {
diff --git a/monkeysphere-icon.png b/monkeysphere-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..13b5efc993274d57c6d373fa7cf0b54c09331ee7
GIT binary patch
literal 937
zcmV;a16KTrP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px&V@X6oR5;6JlU+<(bpXZBz5joE+k0;>rMECx_~-`(MkkV4FrwL**^F6O)Wk$x
z%-rG<ebJa`)JS~VgD?7|n?4w`_(I}%S;%4*7=sOGTtt^a_fZ%HR@>f7DgEwkdvC8#
zB%r^i^Kf!<9?oH~i+4{RBbiz~B)MD{0=+%Y91Qj%SJqYDZap7cTfh9_$6qM;4`fHY
zIeOd+p1<nr?jEyPENzXhM%b)YtgfsGhEYF3Eaa8pp+n)B+4<=100sa?Um9T@qV%JQ
z`dNXu!(>=Uk^>e>(cC11a&{Poj`UW#wEQS?skyE5n_O(|$vVU7<c;S$2M!KCcX8&%
z&DV3;9C1huuvjgiEDM`y;Awvg3Plb1QW>SPX3@%(L+x_Isn1RipK8f2?I*vy?@#o*
zv|g?=L>3prs2Fur${Kh<gj?VcdlH4k#-pUwu(}#WK9gmwWku){GyD1j?!(mo;#;`)
z+f9s5OrmNq(A6Y9|L8Rg`6yUQkWox<LKQ`bC?7t7cRu+VnY0a2tsjBl2<X!EIKH}?
zMz&<Ygb7a*4?P*inTY~kkT>yacLA4IBuvGf_;j=lEp8_^{!wt}`V}}6QwqJE@uhP4
zgqx!bvc)QhQ9)majAKC-gFOLwyPP=CP=p+)VIUNM^3$IXL<wDeo%NE(`#m{x_S{27
z-8vdqQzD@hIh{gw*l>Ephn6-!_-D_-e;^1CNn(8ZF{b}ohG_x`qxpwh_cp#H6O-2>
zl(Sy1)p0VDD@e6!4ci(EUuz?p8YRsAItj6ofY}<t`R{&)n$E)|3E+9#*!0}*5efhc
zi;=rWhC^d4%U;sTWyH73kYyQs`v8sxUj|1BG?T);zXL1rG(_IM#q)d&0N9;HiGnaE
zNsbgD1l!p>YE*<CUjU<oQGGlMn%h86Ul2Bq1Lf==uq^v<&y<%}*E4=^hlfxy2(u2G
zQ^wLCw{Z7S4ELAUVYl0mtnqko|3O_hj0-dKch>ea004$zzhzmbR5uJn;~DG=JcV{n
zfzz%dX}X~1i|~59Q<Rdw_k3YDM}|Xht7__^rfCkBOGc~Pi3XR9^mZDAS~dwVbmiKO
zwg0_whc0hNSg%zVHdASTQc>HJYO0{5(ziv*%v(ABy~(NB$Zr3?BJo?{e}{Y{00000
LNkvXXu0mjf7m2i-

literal 0
HcmV?d00001

-- 
2.26.2