[balsa/gtk3] Always set line-wrapping of a long label to TRUE

[Peter Bloomfield <peterb src gnome org>]

commit bb877172b460d0662923c8cd036820c4cefee028
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Jun 11 19:30:38 2016 -0400

    Always set line-wrapping of a long label to TRUE
    
        * src/balsa-mime-widget-message.c (expanded_cb): do not change
        line-wrapping;
        (add_header_gchar): set line-wrapping to TRUE even if the label
        is to be ellipsized.

 ChangeLog                       |    9 +++++++++
 src/balsa-mime-widget-message.c |   19 ++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cbe7d96..571d198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2016-06-11  Peter Bloomfield  <pbloomfield bellsouth net>
 
+       Set line-wrapping of a long label to TRUE and do not change it.
+
+       * src/balsa-mime-widget-message.c (expanded_cb): do not change
+       line-wrapping;
+       (add_header_gchar): set line-wrapping to TRUE even if the label
+       is to be ellipsized.
+
+2016-06-11  Peter Bloomfield  <pbloomfield bellsouth net>
+
        * src/balsa-mime-widget-message.c (add_header_gchar): in an
        address, replace '\r' or '\n' with a space.
 
diff --git a/src/balsa-mime-widget-message.c b/src/balsa-mime-widget-message.c
index c4747d2..a34eea3 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -547,13 +547,9 @@ label_size_allocate_cb(GtkLabel * label, GdkRectangle * rectangle,
 static void
 expanded_cb(GtkExpander * expander, GParamSpec * arg1, GtkLabel * label)
 {
-    if (gtk_expander_get_expanded(expander)) {
-        gtk_label_set_line_wrap(label, TRUE);
-        gtk_label_set_ellipsize(label, PANGO_ELLIPSIZE_NONE);
-    } else {
-        gtk_label_set_line_wrap(label, FALSE);
-        gtk_label_set_ellipsize(label, PANGO_ELLIPSIZE_END);
-    }
+    gtk_label_set_ellipsize(label,
+                            gtk_expander_get_expanded(expander) ?
+                            PANGO_ELLIPSIZE_NONE : PANGO_ELLIPSIZE_END);
 }
 
 #define BALSA_MESSAGE_HEADER "balsa-message-header"
@@ -618,6 +614,7 @@ add_header_gchar(GtkGrid * grid, const gchar * header, const gchar * label,
                                        GTK_STYLE_PROVIDER(css_provider),
                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
+        gtk_label_set_line_wrap(GTK_LABEL(value_label), TRUE);
         gtk_label_set_line_wrap_mode(GTK_LABEL(value_label), PANGO_WRAP_WORD_CHAR);
         gtk_label_set_selectable(GTK_LABEL(value_label), TRUE);
 #if GTK_CHECK_VERSION(3, 16, 0)
@@ -631,20 +628,20 @@ G_GNUC_END_IGNORE_DEPRECATIONS
         gtk_widget_set_hexpand(value_label, TRUE);
 
         expander = gtk_expander_new(NULL);
-        g_signal_connect(expander, "notify::expanded",
-                         G_CALLBACK(expanded_cb), value_label);
 
         /*
          * If we are showing all headers, we initially expand the
          * header, otherwise collapse it.
          */
-        if(show_all_headers) {
-            gtk_label_set_line_wrap(GTK_LABEL(value_label), TRUE);
+        if (show_all_headers) {
+            gtk_label_set_ellipsize(GTK_LABEL(value_label), PANGO_ELLIPSIZE_NONE);
             gtk_expander_set_expanded(GTK_EXPANDER(expander), TRUE);
         } else {
             gtk_label_set_ellipsize(GTK_LABEL(value_label), PANGO_ELLIPSIZE_END);
             gtk_expander_set_expanded(GTK_EXPANDER(expander), FALSE);
         }
+        g_signal_connect(expander, "notify::expanded",
+                         G_CALLBACK(expanded_cb), value_label);
         g_signal_connect(value_label, "size-allocate",
                          G_CALLBACK(label_size_allocate_cb), expander);