X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=6338898dd04a0a4a1e3268529aa47515f9d01695;hp=9f5a1f256b02a1b3be0f844b63fd32615366e9ea;hb=9ac452ac9a046897f12fefbe4223ae274c8a53fb;hpb=fb88aab103058db34674c23e527388c3411391de diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 9f5a1f2..6338898 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -32,15 +32,16 @@ #include #include #include +#include #include #include #include #include #include - +#include #include - +#include #include #include #include @@ -114,10 +115,9 @@ static void modest_header_view_notify_observers( 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, @@ -150,8 +150,11 @@ struct _ModestHeaderViewPrivate { gulong selection_changed_handler; gulong acc_removed_handler; - HeaderViewStatus status; GList *drag_begin_cached_selected_rows; + + HeaderViewStatus status; + guint status_timeout; + gboolean notify_status; /* whether or not the filter_row should notify about changes in the filtering */ }; typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper; @@ -282,7 +285,7 @@ modest_header_view_class_init (ModestHeaderViewClass *klass) static void tny_folder_observer_init (TnyFolderObserverIface *klass) { - klass->update_func = folder_monitor_update; + klass->update = folder_monitor_update; } static GtkTreeViewColumn* @@ -342,6 +345,9 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn ModestHeaderViewPrivate *priv; GtkTreeViewColumn *compact_column = NULL; const GList *cursor; + + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE); + g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, FALSE); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -383,12 +389,15 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn g_object_set (G_OBJECT (renderer_subject), "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 1.0, NULL); + gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_subject), 1); g_object_set (G_OBJECT (renderer_recpt), "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0, NULL); + gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_recpt), 1); g_object_set(G_OBJECT(renderer_compact_date_or_status), "xalign", 1.0, "yalign", 0.0, NULL); + gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_compact_date_or_status), 1); g_object_set (G_OBJECT (renderer_priority), "yalign", 1.0, NULL); g_object_set (G_OBJECT (renderer_attach), @@ -555,6 +564,8 @@ modest_header_view_init (ModestHeaderView *obj) priv->observers_lock = g_mutex_new (); priv->status = HEADER_VIEW_INIT; + priv->status_timeout = 0; + priv->notify_status = TRUE; priv->observer_list_lock = g_mutex_new(); priv->observer_list = NULL; @@ -700,7 +711,7 @@ modest_header_view_count_selected_headers (ModestHeaderView *self) GtkTreeSelection *sel; guint selected_rows; - g_return_val_if_fail (self, 0); + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), 0); /* Get selection object and check selected rows count */ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); @@ -714,8 +725,8 @@ modest_header_view_has_selected_headers (ModestHeaderView *self) { GtkTreeSelection *sel; gboolean empty; - - g_return_val_if_fail (self, FALSE); + + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE); /* Get selection object and check selected rows count */ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); @@ -736,7 +747,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self) GtkTreeModel *tree_model = NULL; GtkTreeIter iter; - g_return_val_if_fail (self, NULL); + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -810,6 +821,8 @@ modest_header_view_select_next (ModestHeaderView *self) GtkTreeModel *model; GtkTreePath *path; + g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); path = get_selected_row (GTK_TREE_VIEW(self), &model); if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) { @@ -834,6 +847,8 @@ modest_header_view_select_prev (ModestHeaderView *self) GtkTreeModel *model; GtkTreePath *path; + g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); path = get_selected_row (GTK_TREE_VIEW(self), &model); if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) { @@ -855,8 +870,9 @@ modest_header_view_select_prev (ModestHeaderView *self) GList* modest_header_view_get_columns (ModestHeaderView *self) -{ - g_return_val_if_fail (self, FALSE); +{ + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL); + return gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); } @@ -870,10 +886,10 @@ modest_header_view_set_style (ModestHeaderView *self, gboolean show_col_headers = FALSE; ModestHeaderViewStyle old_style; - g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE); g_return_val_if_fail (style >= 0 && MODEST_HEADER_VIEW_STYLE_NUM, FALSE); - + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); if (priv->style == style) return TRUE; /* nothing to do */ @@ -900,7 +916,8 @@ modest_header_view_set_style (ModestHeaderView *self, ModestHeaderViewStyle modest_header_view_get_style (ModestHeaderView *self) { - g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE); + return MODEST_HEADER_VIEW_GET_PRIVATE(self)->style; } @@ -918,6 +935,9 @@ modest_header_view_on_expose_event(GtkTreeView *header_view, model = gtk_tree_view_get_model(header_view); + if (!model) + return FALSE; + sel = gtk_tree_view_get_selection(header_view); if(!gtk_tree_selection_count_selected_rows(sel)) if (gtk_tree_model_get_iter_first(model, &tree_iter)) { @@ -931,31 +951,13 @@ modest_header_view_on_expose_event(GtkTreeView *header_view, 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) { ModestHeaderViewPrivate *priv; + + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); if (priv->folder) @@ -965,22 +967,22 @@ modest_header_view_get_folder (ModestHeaderView *self) } static void -modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) +set_folder_intern_get_headers_async_cb (TnyFolder *folder, + gboolean cancelled, + TnyList *headers, + GError *err, + gpointer user_data) { - TnyFolderType type; - TnyList *headers; + ModestHeaderView *self; ModestHeaderViewPrivate *priv; - GList *cols, *cursor; - GtkTreeModel *filter_model, *sortable; - guint sort_colid; - GtkSortType sort_type; - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + g_return_if_fail (MODEST_IS_HEADER_VIEW (user_data)); - headers = TNY_LIST (tny_gtk_header_list_model_new ()); + self = MODEST_HEADER_VIEW (user_data); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers), - folder, FALSE, NULL, NULL, NULL); + if (cancelled || err) + return; /* Add IDLE observer (monitor) and another folder observer for new messages (self) */ @@ -993,6 +995,39 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers)); tny_folder_monitor_start (priv->monitor); g_mutex_unlock (priv->observers_lock); +} + +static void +modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) +{ + TnyFolderType type; + TnyList *headers; + ModestHeaderViewPrivate *priv; + GList *cols, *cursor; + GtkTreeModel *filter_model, *sortable; + guint sort_colid; + GtkSortType sort_type; + + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + headers = TNY_LIST (tny_gtk_header_list_model_new ()); + + /* Start the monitor in the callback of the + tny_gtk_header_list_model_set_folder call. It's crucial to + do it there and not just after the call because we want the + monitor to observe only the headers returned by the + tny_folder_get_headers_async call that it's inside the + tny_gtk_header_list_model_set_folder call. This way the + monitor infrastructure could successfully cope with + duplicates. For example if a tny_folder_add_msg_async is + happening while tny_gtk_header_list_model_set_folder is + invoked, then the first call could add a header that will + 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, + set_folder_intern_get_headers_async_cb, + NULL, self); sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers)); g_object_unref (G_OBJECT (headers)); @@ -1014,6 +1049,9 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) /* Restore sort column id */ if (cols) { type = modest_tny_folder_guess_folder_type (folder); + if (type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + sort_colid = modest_header_view_get_sort_column_id (self, type); sort_type = modest_header_view_get_sort_type (self, type); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), @@ -1030,12 +1068,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); @@ -1050,6 +1086,9 @@ modest_header_view_sort_by_column_id (ModestHeaderView *self, GtkTreeModel *tree_filter, *sortable = NULL; TnyFolderType type; + g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); + g_return_if_fail (sort_type == GTK_SORT_ASCENDING || sort_type == GTK_SORT_DESCENDING); + /* Get model and private data */ priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); @@ -1058,16 +1097,15 @@ modest_header_view_sort_by_column_id (ModestHeaderView *self, /* Sort tree model */ type = modest_tny_folder_guess_folder_type (priv->folder); - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), + if (type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + else { + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), sort_colid, sort_type); - /* Store new sort parameters */ - modest_header_view_set_sort_params (self, sort_colid, sort_type, type); - - /* Save GConf parameters */ -/* modest_widget_memory_save (modest_runtime_get_conf(), */ -/* G_OBJECT(self), "header-view"); */ - + /* Store new sort parameters */ + modest_header_view_set_sort_params (self, sort_colid, sort_type, type); + } } void @@ -1078,7 +1116,11 @@ modest_header_view_set_sort_params (ModestHeaderView *self, { ModestHeaderViewPrivate *priv; ModestHeaderViewStyle style; - + + g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); + g_return_if_fail (sort_type == GTK_SORT_ASCENDING || sort_type == GTK_SORT_DESCENDING); + g_return_if_fail (type != TNY_FOLDER_TYPE_INVALID); + style = modest_header_view_get_style (self); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -1093,6 +1135,9 @@ modest_header_view_get_sort_column_id (ModestHeaderView *self, ModestHeaderViewPrivate *priv; ModestHeaderViewStyle style; + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), 0); + g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, 0); + style = modest_header_view_get_style (self); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -1105,7 +1150,10 @@ modest_header_view_get_sort_type (ModestHeaderView *self, { ModestHeaderViewPrivate *priv; ModestHeaderViewStyle style; - + + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), GTK_SORT_DESCENDING); + g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, GTK_SORT_DESCENDING); + style = modest_header_view_get_style (self); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -1146,24 +1194,64 @@ folder_refreshed_cb (ModestMailOperation *mail_op, g_signal_emit (G_OBJECT (info->header_view), signals[UPDATING_MSG_LIST_SIGNAL], 0, FALSE, NULL); + /* Allow filtering notifications from now on if the current + folder is still the same (if not then the user has selected + another one to refresh, we should wait until that refresh + finishes) */ + if (priv->folder == folder) + priv->notify_status = TRUE; + /* Frees */ + g_object_unref (info->header_view); g_free (info); } +static void +refresh_folder_error_handler (ModestMailOperation *mail_op, + gpointer user_data) +{ + const GError *error = modest_mail_operation_get_error (mail_op); + + if (error->code == TNY_SYSTEM_ERROR_MEMORY || + error->code == TNY_IO_ERROR_WRITE || + error->code == TNY_IO_ERROR_READ) { + ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op); + /* If the mail op has been cancelled then it's not an error: don't show any message */ + if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) { + modest_platform_information_banner (NULL, NULL, + dgettext("ke-recv", + "cerm_device_memory_full")); + } + } +} + void modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder, + gboolean refresh, RefreshAsyncUserCallback callback, gpointer user_data) { ModestHeaderViewPrivate *priv; - ModestWindowMgr *mgr = NULL; - GObject *source = NULL; - SetFolderHelper *info; - - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + 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); + priv->status_timeout = 0; + } + g_mutex_lock (priv->observers_lock); tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (self)); g_object_unref (priv->folder); @@ -1172,19 +1260,19 @@ modest_header_view_set_folder (ModestHeaderView *self, } if (folder) { - ModestMailOperation *mail_op = NULL; GtkTreeSelection *selection; - - /* Get main window to use it as source of mail operation */ - mgr = modest_runtime_get_window_mgr (); - source = G_OBJECT (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ())); + SetFolderHelper *info; + ModestMailOperation *mail_op = NULL; /* Set folder in the model */ modest_header_view_set_folder_intern (self, folder); - + /* Pick my reference. Nothing to do with the mail operation */ priv->folder = g_object_ref (folder); + /* Do not notify about filterings until the refresh finishes */ + priv->notify_status = FALSE; + /* Clear the selection if exists */ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); gtk_tree_selection_unselect_all(selection); @@ -1195,22 +1283,27 @@ modest_header_view_set_folder (ModestHeaderView *self, 0, TRUE, NULL); /* create the helper */ - info = g_malloc0 (sizeof(SetFolderHelper)); - info->header_view = self; + 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 (source); - 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); - + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(main_win), + 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 { @@ -1221,7 +1314,7 @@ 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); + gtk_tree_view_set_model (GTK_TREE_VIEW (self), NULL); modest_header_view_notify_observers(self, NULL, NULL); @@ -1259,7 +1352,12 @@ on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path, /* Dont open DELETED messages */ if (flags & TNY_HEADER_FLAG_DELETED) { - modest_platform_information_banner (NULL, NULL, _("mcen_ib_message_already_deleted")); + GtkWidget *win; + gchar *msg; + win = gtk_widget_get_ancestor (GTK_WIDGET (treeview), GTK_TYPE_WINDOW); + msg = modest_ui_actions_get_msg_already_deleted_error_msg (MODEST_WINDOW (win)); + modest_platform_information_banner (NULL, NULL, msg); + g_free (msg); goto frees; } @@ -1324,14 +1422,14 @@ _modest_header_view_change_selection (GtkTreeSelection *selection, gpointer user_data) { g_return_if_fail (GTK_IS_TREE_SELECTION (selection)); - g_return_if_fail (MODEST_IS_HEADER_VIEW (user_data)); - + g_return_if_fail (user_data && MODEST_IS_HEADER_VIEW (user_data)); + on_selection_changed (selection, user_data); } -static gint compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2) +static gint +compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2) { - /* HH, LL, NN */ if (p1 == p2) return 0; @@ -1350,7 +1448,6 @@ static gint compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2) /* NL */ return 1; - } static gint @@ -1669,24 +1766,50 @@ on_button_press_event(GtkWidget * self, GdkEventButton * event, gpointer userdat { GtkTreeSelection *selection = NULL; GtkTreePath *path = NULL; - gboolean already_selected = FALSE; + gboolean already_selected = FALSE, already_opened = FALSE; + ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN; if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(self), event->x, event->y, &path, NULL, NULL, NULL)) { + GtkTreeIter iter; + GtkTreeModel *model; + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); already_selected = gtk_tree_selection_path_is_selected (selection, path); + + /* Get header from model */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (gtk_tree_model_get_iter (model, &iter, path)) { + GValue value = {0,}; + TnyHeader *header; + + gtk_tree_model_get_value (model, &iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + &value); + header = (TnyHeader *) g_value_get_object (&value); + if (TNY_IS_HEADER (header)) { + status = modest_tny_all_send_queues_get_msg_status (header); + already_opened = modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr (), + header, NULL); + } + g_value_unset (&value); + } } - /* Enable drag and drop onlly if the user clicks on a row that + /* Enable drag and drop only if the user clicks on a row that it's already selected. If not, let him select items using - the pointer */ - if (!already_selected) { + the pointer. If the message is in an OUTBOX and in sending + status disable drag and drop as well */ + if (!already_selected || + status == MODEST_TNY_SEND_QUEUE_SENDING || + already_opened) disable_drag_and_drop(self); - } - if (path != NULL) { + if (path != NULL) gtk_tree_path_free(path); - } + /* 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 FALSE; } @@ -1708,6 +1831,30 @@ folder_monitor_update (TnyFolderObserver *self, if (folder != priv->folder) goto frees; + MODEST_DEBUG_BLOCK ( + if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) + g_print ("ADDED %d/%d (r/t) \n", + tny_folder_change_get_new_unread_count (change), + tny_folder_change_get_new_all_count (change)); + if (changed & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT) + g_print ("ALL COUNT %d\n", + tny_folder_change_get_new_all_count (change)); + if (changed & TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT) + g_print ("UNREAD COUNT %d\n", + tny_folder_change_get_new_unread_count (change)); + if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) + g_print ("EXPUNGED %d/%d (r/t) \n", + tny_folder_change_get_new_unread_count (change), + tny_folder_change_get_new_all_count (change)); + if (changed & TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME) + g_print ("FOLDER RENAME\n"); + if (changed & TNY_FOLDER_CHANGE_CHANGED_MSG_RECEIVED) + g_print ("MSG RECEIVED %d/%d (r/t) \n", + tny_folder_change_get_new_unread_count (change), + tny_folder_change_get_new_all_count (change)); + g_print ("---------------------------------------------------\n"); + ); + /* Check folder count */ if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) || (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)) { @@ -1736,8 +1883,10 @@ folder_monitor_update (TnyFolderObserver *self, gboolean modest_header_view_is_empty (ModestHeaderView *self) { - ModestHeaderViewPrivate *priv = NULL; - + ModestHeaderViewPrivate *priv; + + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), TRUE); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (self)); return priv->status == HEADER_VIEW_EMPTY; @@ -1746,12 +1895,16 @@ modest_header_view_is_empty (ModestHeaderView *self) void modest_header_view_clear (ModestHeaderView *self) { - modest_header_view_set_folder (self, NULL, NULL, NULL); + g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); + + modest_header_view_set_folder (self, NULL, FALSE, NULL, NULL); } void modest_header_view_copy_selection (ModestHeaderView *header_view) { + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view)); + /* Copy selection */ _clipboard_set_selected_data (header_view, FALSE); } @@ -1763,7 +1916,8 @@ modest_header_view_cut_selection (ModestHeaderView *header_view) const gchar **hidding = NULL; guint i, n_selected; - g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW (header_view)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view); /* Copy selection */ @@ -1807,7 +1961,36 @@ _clipboard_set_selected_data (ModestHeaderView *header_view, g_object_unref (headers); } +typedef struct { + ModestHeaderView *self; + TnyFolder *folder; +} NotifyFilterInfo; + +static gboolean +notify_filter_change (gpointer data) +{ + NotifyFilterInfo *info = (NotifyFilterInfo *) data; + + g_signal_emit (info->self, + signals[MSG_COUNT_CHANGED_SIGNAL], + 0, info->folder, NULL); + + return FALSE; +} + +static void +notify_filter_change_destroy (gpointer data) +{ + NotifyFilterInfo *info = (NotifyFilterInfo *) data; + ModestHeaderViewPrivate *priv; + + priv = MODEST_HEADER_VIEW_GET_PRIVATE (info->self); + priv->status_timeout = 0; + g_object_unref (info->self); + g_object_unref (info->folder); + g_slice_free (NotifyFilterInfo, info); +} static gboolean filter_row (GtkTreeModel *model, @@ -1821,18 +2004,23 @@ filter_row (GtkTreeModel *model, gchar *id = NULL; gboolean visible = TRUE; gboolean found = FALSE; - + GValue value = {0,}; + HeaderViewStatus old_status; + g_return_val_if_fail (MODEST_IS_HEADER_VIEW (user_data), FALSE); priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data); /* Get header from model */ - gtk_tree_model_get (model, iter, - TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, - TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, - -1); + gtk_tree_model_get_value (model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &value); + flags = (TnyHeaderFlags) g_value_get_int (&value); + g_value_unset (&value); + gtk_tree_model_get_value (model, iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &value); + header = (TnyHeader *) g_value_get_object (&value); + g_value_unset (&value); - /* Hide mark as deleted heders */ - if (flags & TNY_HEADER_FLAG_DELETED) { + /* Hide deleted and mark as deleted heders */ + if (flags & TNY_HEADER_FLAG_DELETED || + flags & TNY_HEADER_FLAG_EXPUNGED) { visible = FALSE; goto frees; } @@ -1844,25 +2032,39 @@ filter_row (GtkTreeModel *model, } /* Get message id from header (ensure is a valid id) */ - if (!header) return FALSE; - id = g_strdup(tny_header_get_message_id (header)); + if (!header) { + visible = FALSE; + goto frees; + } /* Check hiding */ if (priv->hidding_ids != NULL) { + id = tny_header_dup_message_id (header); for (i=0; i < priv->n_selected && !found; i++) if (priv->hidding_ids[i] != NULL && id != NULL) found = (!strcmp (priv->hidding_ids[i], id)); visible = !found; + g_free(id); } frees: + old_status = priv->status; priv->status = ((gboolean) priv->status) && !visible; - - /* Free */ - if (header) - g_object_unref (header); - g_free(id); + if ((priv->notify_status) && (priv->status != old_status)) { + NotifyFilterInfo *info; + + if (priv->status_timeout) + g_source_remove (priv->status_timeout); + + info = g_slice_new0 (NotifyFilterInfo); + info->self = g_object_ref (G_OBJECT (user_data)); + info->folder = tny_header_get_folder (header); + priv->status_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000, + notify_filter_change, + info, + notify_filter_change_destroy); + } return visible; } @@ -1889,13 +2091,13 @@ modest_header_view_refilter (ModestHeaderView *header_view) GtkTreeModel *model = NULL; ModestHeaderViewPrivate *priv = NULL; - g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW (header_view)); priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view); - + /* Hide cut headers */ model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); if (GTK_IS_TREE_MODEL_FILTER (model)) { - priv->status = 0; + priv->status = HEADER_VIEW_INIT; gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); } } @@ -1923,19 +2125,18 @@ on_account_removed (TnyAccountStore *self, my_account = tny_folder_get_account (priv->folder); if (my_account == account) modest_header_view_clear (MODEST_HEADER_VIEW (user_data)); - g_object_unref (account); + g_object_unref (my_account); } } -void modest_header_view_add_observer( - ModestHeaderView *header_view, - ModestHeaderViewObserver *observer) +void +modest_header_view_add_observer(ModestHeaderView *header_view, + ModestHeaderViewObserver *observer) { - ModestHeaderViewPrivate *priv = NULL; - - g_assert(MODEST_IS_HEADER_VIEW(header_view)); - g_assert(observer != NULL); - g_assert(MODEST_IS_HEADER_VIEW_OBSERVER(observer)); + ModestHeaderViewPrivate *priv; + + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view)); + g_return_if_fail (observer && MODEST_IS_HEADER_VIEW_OBSERVER(observer)); priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view); @@ -1948,11 +2149,10 @@ void modest_header_view_remove_observer(ModestHeaderView *header_view, ModestHeaderViewObserver *observer) { - ModestHeaderViewPrivate *priv = NULL; + ModestHeaderViewPrivate *priv; - g_assert(MODEST_IS_HEADER_VIEW(header_view)); - g_assert(observer != NULL); - g_assert(MODEST_IS_HEADER_VIEW_OBSERVER(observer)); + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view)); + g_return_if_fail (observer && MODEST_IS_HEADER_VIEW_OBSERVER(observer)); priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view); @@ -1970,8 +2170,9 @@ modest_header_view_notify_observers(ModestHeaderView *header_view, GSList *iter; ModestHeaderViewObserver *observer; - g_assert(MODEST_IS_HEADER_VIEW(header_view)); + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view); g_mutex_lock(priv->observer_list_lock);