[balsa/gtk4] balsa-mime-widget-crypto: unmangle

[Peter Bloomfield <peterb src gnome org>]

commit 7256e36dc756227ec7f9a52d8e5771d5ca1cc674
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Mar 13 18:25:59 2021 -0500

    balsa-mime-widget-crypto: unmangle
    
    Unmangle balsa_mime_widget_signature_widget().

 src/balsa-mime-widget-crypto.c | 79 ++++++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 33 deletions(-)
---
diff --git a/src/balsa-mime-widget-crypto.c b/src/balsa-mime-widget-crypto.c
index e68c02d2a..7aea2f0e0 100644
--- a/src/balsa-mime-widget-crypto.c
+++ b/src/balsa-mime-widget-crypto.c
@@ -52,8 +52,7 @@ balsa_mime_widget_new_signature(BalsaMessage * bm,
        return NULL;
 
     mw = g_object_new(BALSA_TYPE_MIME_WIDGET, NULL);
-    gtk_box_append(GTK_BOX(mw),
-                      balsa_mime_widget_signature_widget(mime_body, content_type));
+    gtk_box_append(GTK_BOX(mw), balsa_mime_widget_signature_widget(mime_body, content_type));
 
     return mw;
 }
@@ -93,24 +92,24 @@ balsa_mime_widget_new_pgpkey(BalsaMessage        *bm,
 }
 
 GtkWidget *
-balsa_mime_widget_signature_widget(LibBalsaMessageBody * mime_body,
-                                  const gchar * content_type)
+balsa_mime_widget_signature_widget(LibBalsaMessageBody *mime_body,
+                                   const char          *content_type)
 {
-       gpgme_key_t key;
-       gchar *infostr;
+    gpgme_key_t key;
+    gchar *infostr;
     GtkWidget *expander;
     GtkWidget *vbox, *label;
     GtkWidget *signature_widget;
     gchar **lines;
 
-    if (!mime_body->sig_info ||
-       g_mime_gpgme_sigstat_status(mime_body->sig_info) == GPG_ERR_NOT_SIGNED)
-       return NULL;
+    if (!mime_body->sig_info || g_mime_gpgme_sigstat_status(mime_body->sig_info) == GPG_ERR_NOT_SIGNED)
+        return NULL;
 
     infostr = g_mime_gpgme_sigstat_to_gchar(mime_body->sig_info, FALSE, balsa_app.date_string);
-    if (infostr == NULL) {
+
+    if (infostr == NULL)
         return NULL;
-    }
+
     lines = g_strsplit(infostr, "\n", 2);
     g_free(infostr);
 
@@ -119,15 +118,19 @@ balsa_mime_widget_signature_widget(LibBalsaMessageBody * mime_body,
     gtk_label_set_selectable(GTK_LABEL(label), TRUE);
     gtk_widget_set_halign(label, GTK_ALIGN_START);
     gtk_box_append(GTK_BOX(vbox), label);
+
     key = g_mime_gpgme_sigstat_key(mime_body->sig_info);
     if (key != NULL) {
-               GtkWidget *key_widget;
+        GtkWidget *key_widget;
 
-               key_widget = libbalsa_gpgme_key(key, g_mime_gpgme_sigstat_fingerprint(mime_body->sig_info), 
0U, FALSE);
-               gtk_box_append(GTK_BOX(vbox), key_widget);
+        key_widget =
+            libbalsa_gpgme_key(key, g_mime_gpgme_sigstat_fingerprint(mime_body->sig_info), 0U,
+                               FALSE);
+        gtk_box_append(GTK_BOX(vbox), key_widget);
     }
+
     if (g_mime_gpgme_sigstat_protocol(mime_body->sig_info) == GPGME_PROTOCOL_OpenPGP) {
-       GtkWidget *hbox;
+        GtkWidget *hbox;
         GtkWidget *button;
 
         hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, BMW_HBOX_SPACE);
@@ -137,31 +140,41 @@ balsa_mime_widget_signature_widget(LibBalsaMessageBody * mime_body,
 
         if (g_mime_gpgme_sigstat_status(mime_body->sig_info) == GPG_ERR_NO_PUBKEY) {
 #ifdef ENABLE_AUTOCRYPT
-               GBytes *autocrypt_key;
-
-               autocrypt_key = autocrypt_get_key(g_mime_gpgme_sigstat_fingerprint(mime_body->sig_info), 
NULL);
-               if (autocrypt_key != NULL) {
-                       button = libbalsa_add_mnemonic_button_to_box(_("_Import Autocrypt key"),
-                                                            hbox, GTK_ALIGN_FILL);
-                       g_object_set_data_full(G_OBJECT(button), "autocrypt_key", autocrypt_key, 
(GDestroyNotify) g_bytes_unref);
-                       g_signal_connect(button, "clicked", G_CALLBACK(on_key_import_button), NULL);
-                       gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
-               } else if (libbalsa_message_get_headers(mime_body->message)->autocrypt_hdr != NULL) {
-                       libbalsa_information(LIBBALSA_INFORMATION_WARNING,
-                               _("The message contains an Autocrypt header, but it is either broken "
-                                 "or the signature has been created using a different key."));
-                       gtk_container_add(GTK_CONTAINER(hbox), button);
-               }
+            GBytes *autocrypt_key;
+
+            autocrypt_key =
+                autocrypt_get_key(g_mime_gpgme_sigstat_fingerprint(mime_body->sig_info), NULL);
+            if (autocrypt_key != NULL) {
+                button = libbalsa_add_mnemonic_button_to_box(_("_Import Autocrypt key"),
+                                                             hbox, GTK_ALIGN_FILL);
+                g_object_set_data_full(G_OBJECT(button), "autocrypt_key", autocrypt_key,
+                                       (GDestroyNotify) g_bytes_unref);
+                g_signal_connect(button, "clicked", G_CALLBACK(on_key_import_button), NULL);
+
+                gtk_widget_set_hexpand(button, TRUE);
+                gtk_widget_set_halign(button, GTK_ALIGN_FILL);
+                gtk_box_append(GTK_BOX(hbox), button);
+            } else if (libbalsa_message_get_headers(mime_body->message)->autocrypt_hdr != NULL) {
+                libbalsa_information(LIBBALSA_INFORMATION_WARNING,
+                                     _("The message contains an Autocrypt header, "
+                                       "but it is either broken "
+                                       "or the signature has been created using a different key."));
+            }
 #endif
             button = libbalsa_add_mnemonic_button_to_box(_("_Search key server for this key"),
-                                                hbox, GTK_ALIGN_FILL);
+                                                         hbox, GTK_ALIGN_FILL);
         } else {
-            button = libbalsa_add_mnemonic_button_to_box(_("_Search key server for updates of this key"),
-                                                hbox, GTK_ALIGN_FILL);
+            button =
+                libbalsa_add_mnemonic_button_to_box(_("_Search key server for updates of this key"),
+                                                    hbox, GTK_ALIGN_FILL);
         }
         g_signal_connect(button, "clicked",
                          G_CALLBACK(on_gpg_key_button),
                          (gpointer) g_mime_gpgme_sigstat_fingerprint(mime_body->sig_info));
+
+        gtk_widget_set_hexpand(button, TRUE);
+        gtk_widget_set_halign(button, GTK_ALIGN_FILL);
+        gtk_box_append(GTK_BOX(hbox), button);
     }
 
     /* Hack alert: if we omit the box below and use the expander as signature widget