If date is 0, then don't show date (fixes NB#101663).

[modest] / src / widgets / modest-compact-mail-header-view.c

diff --git a/src/widgets/modest-compact-mail-header-view.c b/src/widgets/modest-compact-mail-header-view.c
index 4f1f7ab..a0f9a17 100644 (file)
--- a/src/widgets/modest-compact-mail-header-view.c
+++ b/src/widgets/modest-compact-mail-header-view.c
@@ -41,6 +41,7 @@
 #include <modest-datetime-formatter.h>
 #ifdef MODEST_TOOLKIT_HILDON2
 #include <hildon/hildon-gtk.h>
+#include <hildon/hildon-helper.h>
 #endif
 
 static GObjectClass *parent_class = NULL;
@@ -121,28 +122,33 @@ static void fill_address (ModestCompactMailHeaderView *self);
 static void
 set_date_time (ModestCompactMailHeaderView *compact_mail_header)
 {
-       const guint BUF_SIZE = 64; 
-       const gchar *date_str;
-       gchar date_buf[BUF_SIZE];
-       GString *buffer = g_string_new ("");
-
        ModestCompactMailHeaderViewPriv *priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (compact_mail_header);
 
-       modest_text_utils_strftime (date_buf, BUF_SIZE, _HL("wdgt_va_week"), priv->date_to_show);
-       buffer = g_string_append (buffer, date_buf);
-       buffer = g_string_append_c (buffer, ' ');
-       buffer = g_string_append_unichar (buffer, 0x2015);
-       buffer = g_string_append_c (buffer, ' ');
-       date_str = modest_datetime_formatter_format_time (priv->datetime_formatter, priv->date_to_show);
-       buffer = g_string_append (buffer, date_str);
-       gtk_label_set_text (GTK_LABEL (priv->time_label), buffer->str);
-       g_string_free  (buffer, TRUE);
-       buffer = g_string_new ("");
-       modest_text_utils_strftime (date_buf, BUF_SIZE, _HL("wdgt_va_date_medium"), priv->date_to_show);
-       buffer = g_string_append (buffer, date_buf);
-
-       gtk_label_set_text (GTK_LABEL (priv->date_label), buffer->str);
-       g_string_free (buffer, TRUE);
+       if (priv->date_to_show == 0) {
+               gtk_label_set_text (GTK_LABEL (priv->time_label), "");
+               gtk_label_set_text (GTK_LABEL (priv->date_label), "");
+       } else {
+               const guint BUF_SIZE = 64; 
+               const gchar *date_str;
+               gchar date_buf[BUF_SIZE];
+               GString *buffer = g_string_new ("");
+
+               modest_text_utils_strftime (date_buf, BUF_SIZE, _HL("wdgt_va_week"), priv->date_to_show);
+               buffer = g_string_append (buffer, date_buf);
+               buffer = g_string_append_c (buffer, ' ');
+               buffer = g_string_append_unichar (buffer, 0x2015);
+               buffer = g_string_append_c (buffer, ' ');
+               date_str = modest_datetime_formatter_format_time (priv->datetime_formatter, priv->date_to_show);
+               buffer = g_string_append (buffer, date_str);
+               gtk_label_set_text (GTK_LABEL (priv->time_label), buffer->str);
+               g_string_free  (buffer, TRUE);
+               buffer = g_string_new ("");
+               modest_text_utils_strftime (date_buf, BUF_SIZE, _HL("wdgt_va_date_medium"), priv->date_to_show);
+               buffer = g_string_append (buffer, date_buf);
+
+               gtk_label_set_text (GTK_LABEL (priv->date_label), buffer->str);
+               g_string_free (buffer, TRUE);
+       }
 
 }
 
@@ -364,6 +370,9 @@ modest_compact_mail_header_view_instance_init (GTypeInstance *instance, gpointer
        gtk_misc_set_padding (GTK_MISC (priv->time_label), MODEST_MARGIN_DOUBLE, 0);
 
        priv->brand_label = gtk_label_new (NULL);
+#ifdef MODEST_TOOLKIT_HILDON2
+       hildon_helper_set_logical_font (priv->brand_label, "SmallSystemFont");
+#endif
        gtk_label_set_justify (GTK_LABEL (priv->brand_label), GTK_JUSTIFY_RIGHT);
        gtk_misc_set_alignment (GTK_MISC (priv->brand_label), 1.0, 0.5);
        gtk_misc_set_padding (GTK_MISC (priv->brand_label), MODEST_MARGIN_DOUBLE, 0);