X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=a001fd3411bb4cf021a5e89b0df94d4a6eee756e;hp=3fcc74c0d9329d394342b8241fd86a6b2ecc1ef9;hb=fbc6db8166bbc8c0859ce662875ebcf9252456d7;hpb=d80cc8ba404a6493c47cd718e75aa56a469a5eb4 diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 3fcc74c..a001fd3 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -49,6 +49,7 @@ #include "modest-platform.h" #include #include +#include static void modest_header_view_class_init (ModestHeaderViewClass *klass); static void modest_header_view_init (ModestHeaderView *obj); @@ -93,6 +94,7 @@ static void disable_drag_and_drop (GtkWidget *self); static GtkTreePath * get_selected_row (GtkTreeView *self, GtkTreeModel **model); +#ifndef MODEST_TOOLKIT_HILDON2 static gboolean on_focus_in (GtkWidget *sef, GdkEventFocus *event, gpointer user_data); @@ -100,6 +102,7 @@ static gboolean on_focus_in (GtkWidget *sef, static gboolean on_focus_out (GtkWidget *self, GdkEventFocus *event, gpointer user_data); +#endif static void folder_monitor_update (TnyFolderObserver *self, TnyFolderChange *change); @@ -110,15 +113,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, @@ -130,6 +131,7 @@ typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate; struct _ModestHeaderViewPrivate { TnyFolder *folder; ModestHeaderViewStyle style; + gboolean is_outbox; TnyFolderMonitor *monitor; GMutex *observers_lock; @@ -144,6 +146,8 @@ struct _ModestHeaderViewPrivate { /* Filter tree model */ gchar **hidding_ids; guint n_selected; + GtkTreeRowReference *autoselect_reference; + ModestHeaderViewFilter filter; gint sort_colid[2][TNY_FOLDER_TYPE_NUM]; gint sort_type[2][TNY_FOLDER_TYPE_NUM]; @@ -156,6 +160,8 @@ struct _ModestHeaderViewPrivate { HeaderViewStatus status; guint status_timeout; gboolean notify_status; /* whether or not the filter_row should notify about changes in the filtering */ + + ModestDatetimeFormatter *datetime_formatter; }; typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper; @@ -251,8 +257,8 @@ modest_header_view_class_init (ModestHeaderViewClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ModestHeaderViewClass,header_activated), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); + gtk_marshal_VOID__POINTER_POINTER, + G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); signals[ITEM_NOT_FOUND_SIGNAL] = @@ -281,6 +287,11 @@ modest_header_view_class_init (ModestHeaderViewClass *klass) NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + +#ifdef MODEST_TOOLKIT_HILDON2 + gtk_rc_parse_string ("class \"ModestHeaderView\" style \"fremantle-touchlist\""); + +#endif } static void @@ -338,7 +349,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 +363,9 @@ 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 (); + priv->is_outbox = (type == TNY_FOLDER_TYPE_OUTBOX); + + /* 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 (); @@ -381,8 +393,10 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status); g_object_set (G_OBJECT (renderer_subject_box), "yalign", 1.0, NULL); +#ifndef MODEST_TOOLKIT_GTK gtk_cell_renderer_set_fixed_size (renderer_subject_box, -1, 32); gtk_cell_renderer_set_fixed_size (renderer_recpt_box, -1, 32); +#endif g_object_set (G_OBJECT (renderer_recpt_box), "yalign", 0.0, NULL); g_object_set(G_OBJECT(renderer_header), "ellipsize", PANGO_ELLIPSIZE_END, @@ -404,9 +418,15 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn g_object_set (G_OBJECT (renderer_attach), "yalign", 0.0, NULL); +#ifndef MODEST_TOOLKIT_GTK gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 26); gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 26); gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64); +#else + gtk_cell_renderer_set_fixed_size (renderer_attach, 16, 16); + gtk_cell_renderer_set_fixed_size (renderer_priority, 16, 16); + /* gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64); */ +#endif remove_all_columns (self); @@ -427,15 +447,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, @@ -547,11 +558,17 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn compact_column, NULL); } - return TRUE; } static void +datetime_format_changed (ModestDatetimeFormatter *formatter, + ModestHeaderView *self) +{ + gtk_widget_queue_draw (GTK_WIDGET (self)); +} + +static void modest_header_view_init (ModestHeaderView *obj) { ModestHeaderViewPrivate *priv; @@ -560,9 +577,11 @@ modest_header_view_init (ModestHeaderView *obj) priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); priv->folder = NULL; + priv->is_outbox = FALSE; priv->monitor = NULL; priv->observers_lock = g_mutex_new (); + priv->autoselect_reference = NULL; priv->status = HEADER_VIEW_INIT; priv->status_timeout = 0; @@ -574,6 +593,7 @@ modest_header_view_init (ModestHeaderView *obj) priv->clipboard = modest_runtime_get_email_clipboard (); priv->hidding_ids = NULL; priv->n_selected = 0; + priv->filter = MODEST_HEADER_VIEW_FILTER_NONE; priv->selection_changed_handler = 0; priv->acc_removed_handler = 0; @@ -585,6 +605,10 @@ modest_header_view_init (ModestHeaderView *obj) } } + priv->datetime_formatter = modest_datetime_formatter_new (); + g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed", + G_CALLBACK (datetime_format_changed), (gpointer) obj); + setup_drag_and_drop (GTK_WIDGET(obj)); } @@ -598,6 +622,11 @@ modest_header_view_dispose (GObject *obj) self = MODEST_HEADER_VIEW(obj); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + if (priv->datetime_formatter) { + g_object_unref (priv->datetime_formatter); + priv->datetime_formatter = NULL; + } + /* Free in the dispose to avoid unref cycles */ if (priv->folder) { tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj)); @@ -647,6 +676,11 @@ modest_header_view_finalize (GObject *obj) /* Clear hidding array created by cut operation */ _clear_hidding_filter (MODEST_HEADER_VIEW (obj)); + if (priv->autoselect_reference != NULL) { + gtk_tree_row_reference_free (priv->autoselect_reference); + priv->autoselect_reference = NULL; + } + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -683,10 +717,12 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style) g_signal_connect (self, "row-activated", G_CALLBACK (on_header_row_activated), NULL); +#ifndef MODEST_TOOLKIT_HILDON2 g_signal_connect (self, "focus-in-event", G_CALLBACK(on_focus_in), NULL); g_signal_connect (self, "focus-out-event", G_CALLBACK(on_focus_out), NULL); +#endif g_signal_connect (self, "button-press-event", G_CALLBACK(on_button_press_event), NULL); @@ -785,7 +821,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self) static void scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up) { -#ifdef MODEST_PLATFORM_GNOME +#ifdef MODEST_TOOLKIT_GTK GtkTreePath *selected_path; GtkTreePath *start, *end; @@ -810,7 +846,7 @@ scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up) gtk_tree_path_free (start); gtk_tree_path_free (end); -#endif /* MODEST_PLATFORM_GNOME */ +#endif /* MODEST_TOOLKIT_GTK */ } @@ -933,46 +969,79 @@ modest_header_view_on_expose_event(GtkTreeView *header_view, GtkTreeSelection *sel; GtkTreeModel *model; GtkTreeIter tree_iter; + ModestHeaderViewPrivate *priv; + priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view); model = gtk_tree_view_get_model(header_view); if (!model) return FALSE; +#ifdef MODEST_TOOLKIT_HILDON2 + return FALSE; +#endif sel = gtk_tree_view_get_selection(header_view); - if(!gtk_tree_selection_count_selected_rows(sel)) + if(!gtk_tree_selection_count_selected_rows(sel)) { if (gtk_tree_model_get_iter_first(model, &tree_iter)) { + GtkTreePath *tree_iter_path; /* Prevent the widget from getting the focus when selecting the first item */ + tree_iter_path = gtk_tree_model_get_path (model, &tree_iter); g_object_set(header_view, "can-focus", FALSE, NULL); gtk_tree_selection_select_iter(sel, &tree_iter); + gtk_tree_view_set_cursor (header_view, tree_iter_path, NULL, FALSE); g_object_set(header_view, "can-focus", TRUE, NULL); + if (priv->autoselect_reference) { + gtk_tree_row_reference_free (priv->autoselect_reference); + } + priv->autoselect_reference = gtk_tree_row_reference_new (model, tree_iter_path); + gtk_tree_path_free (tree_iter_path); } + } else { + if (priv->autoselect_reference != NULL) { + gboolean moved_selection = FALSE; + GtkTreePath * last_path; + if (gtk_tree_selection_count_selected_rows (sel) != 1) { + moved_selection = TRUE; + } else { + GList *rows; + + rows = gtk_tree_selection_get_selected_rows (sel, NULL); + last_path = gtk_tree_row_reference_get_path (priv->autoselect_reference); + if (gtk_tree_path_compare (last_path, (GtkTreePath *) rows->data) != 0) + 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); + priv->autoselect_reference = NULL; + } else { + + if (gtk_tree_model_get_iter_first (model, &tree_iter)) { + GtkTreePath *current_path; + current_path = gtk_tree_model_get_path (model, &tree_iter); + last_path = gtk_tree_row_reference_get_path (priv->autoselect_reference); + if (gtk_tree_path_compare (current_path, last_path) != 0) { + g_object_set(header_view, "can-focus", FALSE, NULL); + gtk_tree_selection_unselect_all (sel); + gtk_tree_selection_select_iter(sel, &tree_iter); + gtk_tree_view_set_cursor (header_view, current_path, NULL, FALSE); + g_object_set(header_view, "can-focus", TRUE, NULL); + gtk_tree_row_reference_free (priv->autoselect_reference); + priv->autoselect_reference = gtk_tree_row_reference_new (model, current_path); + } + gtk_tree_path_free (current_path); + gtk_tree_path_free (last_path); + } + } + } + } return FALSE; } -/* - * This function sets a sortable model in the header view. It's just - * used for developing purposes, because it only does a - * gtk_tree_view_set_model - */ -static void -modest_header_view_set_model (GtkTreeView *header_view, GtkTreeModel *model) -{ -/* GtkTreeModel *old_model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); */ -/* if (old_model_sort && GTK_IS_TREE_MODEL_SORT (old_model_sort)) { */ -/* GtkTreeModel *old_model; */ -/* ModestHeaderViewPrivate *priv; */ -/* priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view); */ -/* old_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (old_model_sort)); */ - -/* /\* Set new model *\/ */ -/* gtk_tree_view_set_model (header_view, model); */ -/* } else */ - gtk_tree_view_set_model (header_view, model); -} - TnyFolder* modest_header_view_get_folder (ModestHeaderView *self) { @@ -1003,6 +1072,9 @@ set_folder_intern_get_headers_async_cb (TnyFolder *folder, self = MODEST_HEADER_VIEW (user_data); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + if (cancelled || err) + return; + /* Add IDLE observer (monitor) and another folder observer for new messages (self) */ g_mutex_lock (priv->observers_lock); @@ -1087,12 +1159,10 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) } /* Set new model */ - modest_header_view_set_model (GTK_TREE_VIEW (self), filter_model); + gtk_tree_view_set_model (GTK_TREE_VIEW (self), filter_model); modest_header_view_notify_observers(self, GTK_TREE_MODEL(filter_model), tny_folder_get_id(folder)); g_object_unref (G_OBJECT (filter_model)); -/* modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); */ -/* g_object_unref (G_OBJECT (sortable)); */ /* Free */ g_list_free (cols); @@ -1249,24 +1319,17 @@ refresh_folder_error_handler (ModestMailOperation *mail_op, void modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder, + gboolean refresh, + ModestWindow *progress_window, RefreshAsyncUserCallback callback, gpointer user_data) { ModestHeaderViewPrivate *priv; - SetFolderHelper *info; - ModestWindow *main_win; g_return_if_fail (self); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), - FALSE); /* don't create */ - if (!main_win) { - g_warning ("%s: BUG: no main window", __FUNCTION__); - return; - } - if (priv->folder) { if (priv->status_timeout) { g_source_remove (priv->status_timeout); @@ -1281,8 +1344,9 @@ modest_header_view_set_folder (ModestHeaderView *self, } if (folder) { - ModestMailOperation *mail_op = NULL; GtkTreeSelection *selection; + SetFolderHelper *info; + ModestMailOperation *mail_op = NULL; /* Set folder in the model */ modest_header_view_set_folder_intern (self, folder); @@ -1303,24 +1367,28 @@ modest_header_view_set_folder (ModestHeaderView *self, 0, TRUE, NULL); /* create the helper */ - info = g_malloc0 (sizeof(SetFolderHelper)); + info = g_malloc0 (sizeof (SetFolderHelper)); info->header_view = g_object_ref (self); info->cb = callback; info->user_data = user_data; /* Create the mail operation (source will be the parent widget) */ - mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(main_win), - refresh_folder_error_handler, - NULL, NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - - /* Refresh the folder asynchronously */ - modest_mail_operation_refresh_folder (mail_op, - folder, - folder_refreshed_cb, - info); - + if (progress_window) + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(progress_window), + refresh_folder_error_handler, + NULL, NULL); + if (refresh) { + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + /* Refresh the folder asynchronously */ + modest_mail_operation_refresh_folder (mail_op, + folder, + folder_refreshed_cb, + info); + } else { + folder_refreshed_cb (mail_op, folder, info); + } /* Free */ g_object_unref (mail_op); } else { @@ -1331,7 +1399,13 @@ modest_header_view_set_folder (ModestHeaderView *self, g_object_unref (G_OBJECT (priv->monitor)); priv->monitor = NULL; } - modest_header_view_set_model (GTK_TREE_VIEW (self), 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); @@ -1381,7 +1455,7 @@ on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path, /* Emit signal */ g_signal_emit (G_OBJECT(self), signals[HEADER_ACTIVATED_SIGNAL], - 0, header); + 0, header, path); /* Free */ frees: @@ -1626,6 +1700,9 @@ const GtkTargetEntry header_view_drag_types[] = { static void enable_drag_and_drop (GtkWidget *self) { +#ifdef MODEST_TOOLKIT_HILDON2 + return; +#endif gtk_drag_source_set (self, GDK_BUTTON1_MASK, header_view_drag_types, G_N_ELEMENTS (header_view_drag_types), @@ -1635,12 +1712,18 @@ enable_drag_and_drop (GtkWidget *self) static void disable_drag_and_drop (GtkWidget *self) { +#ifdef MODEST_TOOLKIT_HILDON2 + return; +#endif gtk_drag_source_unset (self); } static void setup_drag_and_drop (GtkWidget *self) { +#ifdef MODEST_TOOLKIT_HILDON2 + return; +#endif enable_drag_and_drop(self); g_signal_connect(G_OBJECT (self), "drag_data_get", G_CALLBACK(drag_data_get_cb), NULL); @@ -1676,6 +1759,7 @@ get_selected_row (GtkTreeView *self, GtkTreeModel **model) return path; } +#ifndef MODEST_TOOLKIT_HILDON2 /* * This function moves the tree view scroll to the current selected * row when the widget grabs the focus @@ -1714,33 +1798,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); @@ -1770,6 +1827,7 @@ on_focus_out (GtkWidget *self, } return FALSE; } +#endif static gboolean on_button_release_event(GtkWidget * self, GdkEventButton * event, gpointer userdata) @@ -1827,7 +1885,7 @@ on_button_press_event(GtkWidget * self, GdkEventButton * event, gpointer userdat /* If it's already opened then do not let the button-press event go on because it'll perform a message open because we're clicking on to an already selected header */ - return (already_opened) ? TRUE : FALSE; + return FALSE; } static void @@ -1914,7 +1972,7 @@ modest_header_view_clear (ModestHeaderView *self) { g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); - modest_header_view_set_folder (self, NULL, NULL, NULL); + modest_header_view_set_folder (self, NULL, FALSE, NULL, NULL, NULL); } void @@ -2065,6 +2123,18 @@ filter_row (GtkTreeModel *model, g_free(id); } + if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_DELETABLE)) { + if (priv->is_outbox && + modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) + visible = FALSE; + } + + if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_MOVEABLE)) { + if (priv->is_outbox && + modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) + visible = FALSE; + } + frees: old_status = priv->status; priv->status = ((gboolean) priv->status) && !visible; @@ -2203,3 +2273,47 @@ modest_header_view_notify_observers(ModestHeaderView *header_view, g_mutex_unlock(priv->observer_list_lock); } +const gchar * +_modest_header_view_get_display_date (ModestHeaderView *self, time_t date) +{ + ModestHeaderViewPrivate *priv = NULL; + + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + return modest_datetime_formatter_display_datetime (priv->datetime_formatter, date); +} + +void +modest_header_view_set_filter (ModestHeaderView *self, + ModestHeaderViewFilter filter) +{ + ModestHeaderViewPrivate *priv; + GtkTreeModel *filter_model; + + g_return_if_fail (MODEST_IS_HEADER_VIEW (self)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); + + priv->filter |= filter; + + filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (GTK_IS_TREE_MODEL_FILTER(filter_model)) { + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); + } +} + +void +modest_header_view_unset_filter (ModestHeaderView *self, + ModestHeaderViewFilter filter) +{ + ModestHeaderViewPrivate *priv; + GtkTreeModel *filter_model; + + g_return_if_fail (MODEST_IS_HEADER_VIEW (self)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); + + priv->filter &= ~filter; + + filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (GTK_IS_TREE_MODEL_FILTER(filter_model)) { + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); + } +}