Changeset 5434:677e7712d735

Timestamp:

2008-06-29 01:09:33 (2 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Improve gpgme SMIME uid display: align each line by the length of the first.

Files:

• crypt-gpgme.c (modified) (6 diffs)

crypt-gpgme.c

@@ -1253 +1253 @@
 }
 
-static void print_smime_keyinfo (gpgme_signature_t sig, gpgme_key_t key,
-                                 STATE *s)
-{
+static void print_smime_keyinfo (const char* msg, gpgme_signature_t sig,
+                                 gpgme_key_t key, STATE *s)
+{
+  size_t msglen;
   gpgme_user_id_t uids = NULL;
-  int aka = 0;
-
+  int i, aka = 0;
+
+  state_attach_puts (msg, s);
+  state_attach_puts (" ", s);
   for (uids = key->uids; uids; uids = uids->next)
   {
@@ -1264 +1267 @@
       continue;
     if (aka)
-      state_attach_puts (_("                aka: "), s);
+    {
+      msglen = mutt_strlen (msg) - 4;
+      for (i = 0; i < msglen; i++)
+        state_attach_puts(" ", s);
+      state_attach_puts(_("aka: "), s);
+    }
     state_attach_puts (uids->uid, s);
     state_attach_puts ("\n", s);
@@ -1270 +1278 @@
     aka = 1;
   }
-  state_attach_puts (_("            created: "), s);
+
+  msglen = mutt_strlen (msg) - 8;
+  for (i = 0; i < msglen; i++)
+    state_attach_puts(" ", s);
+  state_attach_puts (_("created: "), s);
   print_time (sig->timestamp, s);
   state_attach_puts ("\n", s);  
@@ -1288 +1300 @@
   int i, anybad = 0, anywarn = 0;
   unsigned int sum;
-  gpgme_user_id_t uids = NULL;
   gpgme_verify_result_t result;
   gpgme_signature_t sig;
@@ -1343 +1354 @@
       else if ((sum & GPGME_SIGSUM_GREEN))
       {
-        state_attach_puts (_("Good signature from: "), s);
-        print_smime_keyinfo (sig, key, s);
-        state_attach_puts (_("            expires: "), s);
-        print_time (sig->exp_timestamp, s);
-        state_attach_puts ("\n", s);
+        print_smime_keyinfo (_("Good signature from:"), sig, key, s);
         if (show_sig_summary (sum, ctx, key, idx, s, sig))
           anywarn = 1;
@@ -1354 +1361 @@
       else if ((sum & GPGME_SIGSUM_RED))
       {
-        state_attach_puts (_("*BAD* signature claimed to be from: "), s);
-        print_smime_keyinfo (sig, key, s);
+        print_smime_keyinfo (_("*BAD* signature from:"), sig, key, s);
         show_sig_summary (sum, ctx, key, idx, s, sig);
       }
       else if (!anybad && key && (key->protocol == GPGME_PROTOCOL_OpenPGP))
-        { /* We can't decide (yellow) but this is a PGP key with a good
-             signature, so we display what a PGP user expects: The name,
-             fingerprint and the key validity (which is neither fully or
-             ultimate). */
-          state_attach_puts (_("Good signature from: "), s);
-          state_attach_puts (uid, s);
-          state_attach_puts ("\n", s);
-          state_attach_puts (_("            created: "), s);
-          print_time (sig->timestamp, s);
-          state_attach_puts ("\n", s);
-          show_one_sig_validity (ctx, idx, s);
-          show_fingerprint (key,s);
-          if (show_sig_summary (sum, ctx, key, idx, s, sig))
-            anywarn = 1;
-        }
+      { /* We can't decide (yellow) but this is a PGP key with a good
+           signature, so we display what a PGP user expects: The name,
+           fingerprint and the key validity (which is neither fully or
+           ultimate). */
+        print_smime_keyinfo (_("Good signature from:"), sig, key, s);
+        show_one_sig_validity (ctx, idx, s);
+        show_fingerprint (key,s);
+        if (show_sig_summary (sum, ctx, key, idx, s, sig))
+          anywarn = 1;
+      }
       else /* can't decide (yellow) */
       {
-        state_attach_puts (_("Problem signature from: "), s);
-        print_smime_keyinfo (sig, key, s);
-        state_attach_puts (_("            expires: "), s);
+        print_smime_keyinfo (_("Problem signature from:"), sig, key, s);
+        state_attach_puts (_("               expires: "), s);
         print_time (sig->exp_timestamp, s);
         state_attach_puts ("\n", s);