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);
+ modest_text_utils_strftime (date_buf, BUF_SIZE, _HL_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);
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);
+ modest_text_utils_strftime (date_buf, BUF_SIZE, _HL_DATE_MEDIUM, priv->date_to_show);
buffer = g_string_append (buffer, date_buf);
gtk_label_set_text (GTK_LABEL (priv->date_label), buffer->str);
}
static void
+unref_event_box (ModestCompactMailHeaderView *self,
+ GtkWidget *event_box)
+{
+ ModestCompactMailHeaderViewPriv *priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self);
+ priv->event_box = NULL;
+}
+
+static void
modest_compact_mail_header_view_instance_init (GTypeInstance *instance, gpointer g_class)
{
ModestCompactMailHeaderView *self = (ModestCompactMailHeaderView *)instance;
gtk_box_pack_start (GTK_BOX (vbox), from_date_hbox, FALSE, FALSE, 0);
- update_style (self);
-
- g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self);
-
priv->datetime_formatter = modest_datetime_formatter_new ();
g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed",
G_CALLBACK (datetime_format_changed), (gpointer) self);
gtk_box_pack_start (GTK_BOX (main_vbox), headers_date_hbox, FALSE, FALSE, 0);
main_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
- gtk_alignment_set_padding (GTK_ALIGNMENT (main_align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (main_align), 0, MODEST_MARGIN_HALF, MODEST_MARGIN_DOUBLE, 0);
priv->event_box = gtk_event_box_new ();
gtk_event_box_set_visible_window (GTK_EVENT_BOX (priv->event_box), TRUE);
gtk_container_add (GTK_CONTAINER (main_align), main_vbox);
gtk_container_add (GTK_CONTAINER (priv->event_box), main_align);
gtk_box_pack_start (GTK_BOX (self), priv->event_box, TRUE, TRUE, 0);
+ g_object_weak_ref (G_OBJECT (priv->event_box), (GWeakNotify) unref_event_box, (gpointer) self);
+
+ update_style (self);
+
+ g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self);
gtk_widget_show_all (priv->event_box);
ModestCompactMailHeaderView *self = (ModestCompactMailHeaderView *)object;
ModestCompactMailHeaderViewPriv *priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self);
+ if (priv->event_box) {
+ g_object_weak_unref (G_OBJECT (priv->event_box), (GWeakNotify) unref_event_box, (gpointer) self);
+ priv->event_box = NULL;
+ }
+
if (priv->datetime_formatter) {
g_object_unref (priv->datetime_formatter);
priv->datetime_formatter = NULL;
g_return_if_fail (MODEST_IS_COMPACT_MAIL_HEADER_VIEW (self));
priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self);
- if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
+ if (gtk_style_lookup_color (gtk_widget_get_style (GTK_WIDGET (self)), "SecondaryTextColor", &style_color)) {
color.red = style_color.red;
color.green = style_color.green;
color.blue = style_color.blue;
}
pango_attr_list_unref (attr_list);
+#ifdef MODEST_COMPACT_HEADER_BG
gdk_color_parse (MODEST_COMPACT_HEADER_BG, &bg_color);
+#endif
gtk_widget_modify_bg (GTK_WIDGET (priv->event_box), GTK_STATE_NORMAL, &bg_color);
}