because of a theme change, we can have uncontrolled access to them.
GtkCellRenderer *renderer_subject;
GtkCellRenderer *renderer_address;
GtkCellRenderer *renderer_date_status;
GtkCellRenderer *renderer_subject;
GtkCellRenderer *renderer_address;
GtkCellRenderer *renderer_date_status;
+
+ GdkColor active_color;
+ GdkColor secondary_color;
};
typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
};
typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
PangoAttrList *attr_list;
GtkStyle *style;
PangoAttribute *attr;
PangoAttrList *attr_list;
GtkStyle *style;
PangoAttribute *attr;
g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
gdk_color_parse ("grey", &style_color);
}
if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
gdk_color_parse ("grey", &style_color);
}
+ priv->secondary_color = style_color;
attr = pango_attr_foreground_new (style_color.red, style_color.green, style_color.blue);
pango_attr_list_insert (attr_list, attr);
attr = pango_attr_foreground_new (style_color.red, style_color.green, style_color.blue);
pango_attr_list_insert (attr_list, attr);
pango_attr_list_insert (attr_list, attr);
g_object_set (G_OBJECT (priv->renderer_address),
pango_attr_list_insert (attr_list, attr);
g_object_set (G_OBJECT (priv->renderer_address),
- "foreground-gdk", &style_color,
+ "foreground-gdk", priv->secondary_color,
"foreground-set", TRUE,
"attributes", attr_list,
NULL);
g_object_set (G_OBJECT (priv->renderer_date_status),
"foreground-set", TRUE,
"attributes", attr_list,
NULL);
g_object_set (G_OBJECT (priv->renderer_date_status),
- "foreground-gdk", &style_color,
+ "foreground-gdk", priv->secondary_color,
"foreground-set", TRUE,
"attributes", attr_list,
NULL);
pango_attr_list_unref (attr_list);
} else {
g_object_set (G_OBJECT (priv->renderer_address),
"foreground-set", TRUE,
"attributes", attr_list,
NULL);
pango_attr_list_unref (attr_list);
} else {
g_object_set (G_OBJECT (priv->renderer_address),
- "foreground-gdk", &style_color,
+ "foreground-gdk", priv->secondary_color,
"foreground-set", TRUE,
"scale", PANGO_SCALE_SMALL,
"scale-set", TRUE,
NULL);
g_object_set (G_OBJECT (priv->renderer_date_status),
"foreground-set", TRUE,
"scale", PANGO_SCALE_SMALL,
"scale-set", TRUE,
NULL);
g_object_set (G_OBJECT (priv->renderer_date_status),
- "foreground-gdk", &style_color,
+ "foreground-gdk", priv->secondary_color,
"foreground-set", TRUE,
"scale", PANGO_SCALE_SMALL,
"scale-set", TRUE,
"foreground-set", TRUE,
"scale", PANGO_SCALE_SMALL,
"scale-set", TRUE,
}
if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "ActiveTextColor", &style_active_color)) {
}
if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "ActiveTextColor", &style_active_color)) {
- new_color = gdk_color_copy (&style_active_color);
+ priv->active_color = style_active_color;
+#ifdef MODEST_TOOLKIT_HILDON2
+ g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (TRUE));
+ g_object_set_data_full (G_OBJECT (priv->renderer_subject), ACTIVE_COLOR, new_color, (GDestroyNotify) gdk_color_free);
+#endif
#ifdef MODEST_TOOLKIT_HILDON2
#ifdef MODEST_TOOLKIT_HILDON2
- g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (new_color != NULL));
- g_object_set_data_full (G_OBJECT (priv->renderer_subject), ACTIVE_COLOR, new_color, (GDestroyNotify) gdk_color_free);
+ g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (FALSE));