On updating the signature in editor, set signature color properly.

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

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index bf9105d..5932522 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -1028,7 +1028,7 @@ modest_header_view_on_expose_event(GtkTreeView *header_view,
                        gtk_tree_path_free (tree_iter_path);
                }
        } else {
-               if (priv->autoselect_reference != NULL) {
+               if (priv->autoselect_reference != NULL && gtk_tree_row_reference_valid (priv->autoselect_reference)) {
                        gboolean moved_selection = FALSE;
                        GtkTreePath * last_path;
                        if (gtk_tree_selection_count_selected_rows (sel) != 1) {
@@ -1119,7 +1119,9 @@ set_folder_intern_get_headers_async_cb (TnyFolder *folder,
 }
 
 static void
-modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
+modest_header_view_set_folder_intern (ModestHeaderView *self,
+                                     TnyFolder *folder,
+                                     gboolean refresh)
 {
        TnyFolderType type;
        TnyList *headers;
@@ -1146,7 +1148,7 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
           be added again by tny_gtk_header_list_model_set_folder, so
           we'd end up with duplicate headers. sergio */
        tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
-                                             folder, FALSE,
+                                             folder, refresh,
                                              set_folder_intern_get_headers_async_cb,
                                              NULL, self);
 
@@ -1375,7 +1377,7 @@ modest_header_view_set_folder (ModestHeaderView *self,
                ModestMailOperation *mail_op = NULL;
 
                /* Set folder in the model */
-               modest_header_view_set_folder_intern (self, folder);
+               modest_header_view_set_folder_intern (self, folder, refresh);
 
                /* Pick my reference. Nothing to do with the mail operation */
                priv->folder = g_object_ref (folder);
@@ -2396,8 +2398,8 @@ update_style (ModestHeaderView *self)
        /* Set color */
 
        attr_list = pango_attr_list_new ();
-       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_get_style (GTK_WIDGET (self)), "SecondaryTextColor", &style_color)) {
+               gdk_color_parse (MODEST_SECONDARY_COLOR, &style_color);
        }
        priv->secondary_color = style_color;
        attr = pango_attr_foreground_new (style_color.red, style_color.green, style_color.blue);
@@ -2439,7 +2441,7 @@ update_style (ModestHeaderView *self)
                              NULL);
        }
 
-       if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "ActiveTextColor", &style_active_color)) {
+       if (gtk_style_lookup_color (gtk_widget_get_style (GTK_WIDGET (self)), "ActiveTextColor", &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));