Merged the new plugin system from branch plugin-system.

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

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index 1b52c1e..bd101d9 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -110,14 +110,13 @@ static void          _clipboard_set_selected_data (ModestHeaderView *header_view
 
 static void          _clear_hidding_filter (ModestHeaderView *header_view);
 
-static void modest_header_view_notify_observers(
-               ModestHeaderView *header_view,
-               GtkTreeModel *model,
-               const gchar *tny_folder_id);
+static void          modest_header_view_notify_observers(ModestHeaderView *header_view,
+                                                        GtkTreeModel *model,
+                                                        const gchar *tny_folder_id);
 
-static gboolean modest_header_view_on_expose_event (GtkTreeView *header_view,
-                                                   GdkEventExpose *event,
-                                                   gpointer user_data);
+static gboolean      modest_header_view_on_expose_event (GtkTreeView *header_view,
+                                                        GdkEventExpose *event,
+                                                        gpointer user_data);
 
 typedef enum {
        HEADER_VIEW_NON_EMPTY,
@@ -338,7 +337,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        GtkTreeModel *tree_filter, *sortable;
        GtkTreeViewColumn *column=NULL;
        GtkTreeSelection *selection = NULL;
-       GtkCellRenderer *renderer_msgtype,*renderer_header,
+       GtkCellRenderer *renderer_header,
                *renderer_attach, *renderer_compact_date_or_status;
        GtkCellRenderer *renderer_compact_header, *renderer_recpt_box, 
                *renderer_subject, *renderer_subject_box, *renderer_recpt,
@@ -352,8 +351,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); 
 
-       /* FIXME: check whether these renderers need to be freed */
-       renderer_msgtype = gtk_cell_renderer_pixbuf_new ();
+       /* TODO: check whether these renderers need to be freed */
        renderer_attach  = gtk_cell_renderer_pixbuf_new ();
        renderer_priority  = gtk_cell_renderer_pixbuf_new ();
        renderer_header  = gtk_cell_renderer_text_new ();
@@ -435,15 +433,6 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                
                switch (col) {
                        
-               case MODEST_HEADER_VIEW_COLUMN_MSGTYPE:
-                       column = get_new_column (_("M"), renderer_msgtype, FALSE,
-                                                TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                                                FALSE,
-                                                (GtkTreeCellDataFunc)_modest_header_view_msgtype_cell_data,
-                                                NULL);
-                       gtk_tree_view_column_set_fixed_width (column, 45);
-                       break;
-
                case MODEST_HEADER_VIEW_COLUMN_ATTACH:
                        column = get_new_column (_("A"), renderer_attach, FALSE,
                                                 TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
@@ -555,7 +544,6 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                                                 compact_column, NULL);
        }
 
-
        return TRUE;
 }
 
@@ -987,6 +975,7 @@ modest_header_view_on_expose_event(GtkTreeView *header_view,
                                        moved_selection = TRUE;
                                g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
                                g_list_free (rows);
+                               gtk_tree_path_free (last_path);
                        }
                        if (moved_selection) {
                                gtk_tree_row_reference_free (priv->autoselect_reference);
@@ -1379,6 +1368,12 @@ modest_header_view_set_folder (ModestHeaderView *self,
                        g_object_unref (G_OBJECT (priv->monitor));
                        priv->monitor = NULL;
                }
+
+               if (priv->autoselect_reference) {
+                       gtk_tree_row_reference_free (priv->autoselect_reference);
+                       priv->autoselect_reference = NULL;
+               }
+
                gtk_tree_view_set_model (GTK_TREE_VIEW (self), NULL); 
 
                modest_header_view_notify_observers(self, NULL, NULL);
@@ -1762,33 +1757,6 @@ on_focus_in (GtkWidget     *self,
        if (selected == NULL) return FALSE;
        selected_path = (GtkTreePath *) selected->data;
 
-       /* Check if we need to scroll */
-       #if GTK_CHECK_VERSION(2, 8, 0) /* TODO: gtk_tree_view_get_visible_range() is only available in GTK+ 2.8 */
-       GtkTreePath *start_path = NULL;
-       GtkTreePath *end_path = NULL;
-       if (gtk_tree_view_get_visible_range (GTK_TREE_VIEW (self),
-                                            &start_path,
-                                            &end_path)) {
-
-               if ((gtk_tree_path_compare (start_path, selected_path) != -1) ||
-                   (gtk_tree_path_compare (end_path, selected_path) != 1)) {
-
-                       /* Scroll to first path */
-                       gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self),
-                                                     selected_path,
-                                                     NULL,
-                                                     TRUE,
-                                                     0.5,
-                                                     0.0);
-               }
-       }
-       if (start_path)
-               gtk_tree_path_free (start_path);
-       if (end_path)
-               gtk_tree_path_free (end_path);
-
-       #endif /* GTK_CHECK_VERSION */
-
        /* Frees */     
        g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL);
        g_list_free (selected);