[balsa/gtk3] Use informative top line for digital signature
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk3] Use informative top line for digital signature
- Date: Tue, 17 May 2016 01:30:12 +0000 (UTC)
commit ac0f2407d3ffd47850d41ed1644388c94f17c72f
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Mon May 16 21:28:51 2016 -0400
Use informative top line for digital signature
* src/balsa-mime-widget-crypto.c
(balsa_mime_widget_signature_widget):
ChangeLog | 8 ++++++++
src/balsa-mime-widget-crypto.c | 25 ++++++++++++++++++-------
2 files changed, 26 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b77f911..f42c197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-05-16 Peter Bloomfield <pbloomfield bellsouth net>
+
+ Use top line of digital signature for GtkExpander label instead
+ of "Digital Signature"
+
+ * src/balsa-mime-widget-crypto.c
+ (balsa_mime_widget_signature_widget):
+
2016-05-16 Albrecht Dreß
Make SSL mandatory
diff --git a/src/balsa-mime-widget-crypto.c b/src/balsa-mime-widget-crypto.c
index 88da682..37ec3a2 100644
--- a/src/balsa-mime-widget-crypto.c
+++ b/src/balsa-mime-widget-crypto.c
@@ -61,7 +61,8 @@ balsa_mime_widget_signature_widget(LibBalsaMessageBody * mime_body,
{
gchar *infostr;
GtkWidget *vbox, *label;
- GtkWidget *expander;
+ GtkWidget *signature_widget;
+ gchar **lines;
if (!mime_body->sig_info ||
mime_body->sig_info->status == GPG_ERR_NOT_SIGNED)
@@ -81,14 +82,17 @@ balsa_mime_widget_signature_widget(LibBalsaMessageBody * mime_body,
g_free(infostr);
infostr = labelstr;
}
+
+ if (!infostr)
+ return NULL;
+ lines = g_strsplit(infostr, "\n", 2);
+ g_free(infostr);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, BMW_VBOX_SPACE);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), BMW_CONTAINER_BORDER);
- label = gtk_label_new(infostr);
+ label = gtk_label_new(lines[1] ? lines[1] : lines[0]);
gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_widget_set_halign(label, GTK_ALIGN_START);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
- g_free(infostr);
#ifdef HAVE_GPG
if (mime_body->sig_info->protocol == GPGME_PROTOCOL_OpenPGP) {
GtkWidget *button;
@@ -109,10 +113,17 @@ balsa_mime_widget_signature_widget(LibBalsaMessageBody * mime_body,
}
#endif /* HAVE_GPG */
- expander = gtk_expander_new(_("Digital Signature"));
- gtk_container_add(GTK_CONTAINER(expander), vbox);
+ if (lines[1]) {
+ signature_widget = gtk_expander_new(lines[0]);
+ gtk_container_add(GTK_CONTAINER(signature_widget), vbox);
+ } else {
+ signature_widget = vbox;
+ }
+ gtk_container_set_border_width(GTK_CONTAINER(signature_widget), BMW_CONTAINER_BORDER);
+
+ g_strfreev(lines);
- return expander;
+ return signature_widget;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]