X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=44990085f6913dbeddc384f7f716d10cf3488028;hp=972a7dd6c6b14f154bf75c5655691e8c11ddac69;hb=acb49abcabb4f4104693a02d6b5814a3f50ab036;hpb=9373a406dc6ac62a374958051d1f72b7bff79642 diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 972a7dd..4499008 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -38,9 +38,9 @@ #include #include #include - +#include #include - +#include #include #include #include @@ -150,8 +150,10 @@ struct _ModestHeaderViewPrivate { gulong selection_changed_handler; gulong acc_removed_handler; - HeaderViewStatus status; GList *drag_begin_cached_selected_rows; + + HeaderViewStatus status; + guint status_timeout; }; typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper; @@ -342,6 +344,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); @@ -555,6 +560,7 @@ modest_header_view_init (ModestHeaderView *obj) priv->observers_lock = g_mutex_new (); priv->status = HEADER_VIEW_INIT; + priv->status_timeout = 0; priv->observer_list_lock = g_mutex_new(); priv->observer_list = NULL; @@ -700,7 +706,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 +720,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 +742,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 +816,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 +842,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 +865,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 +881,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 +911,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 +930,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)) { @@ -956,6 +971,9 @@ 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) @@ -1053,6 +1071,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)); @@ -1080,7 +1101,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); @@ -1095,6 +1120,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); @@ -1107,7 +1135,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); @@ -1149,6 +1180,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op, signals[UPDATING_MSG_LIST_SIGNAL], 0, FALSE, NULL); /* Frees */ + g_object_unref (info->header_view); g_free (info); } @@ -1159,13 +1191,24 @@ modest_header_view_set_folder (ModestHeaderView *self, 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); + g_mutex_lock (priv->observers_lock); tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (self)); g_object_unref (priv->folder); @@ -1177,13 +1220,9 @@ modest_header_view_set_folder (ModestHeaderView *self, 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 ())); - /* 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); @@ -1198,12 +1237,12 @@ modest_header_view_set_folder (ModestHeaderView *self, /* create the helper */ info = g_malloc0 (sizeof(SetFolderHelper)); - info->header_view = self; + 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); + mail_op = modest_mail_operation_new (G_OBJECT(main_win)); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -1261,7 +1300,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; } @@ -1326,14 +1370,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; @@ -1352,7 +1396,6 @@ static gint compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2) /* NL */ return 1; - } static gint @@ -1710,6 +1753,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)) { @@ -1738,8 +1805,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; @@ -1748,12 +1817,16 @@ modest_header_view_is_empty (ModestHeaderView *self) void 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); } 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); } @@ -1765,7 +1838,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 */ @@ -1809,7 +1883,32 @@ _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; + g_object_unref (info->self); + g_object_unref (info->folder); + g_slice_free (NotifyFilterInfo, info); +} static gboolean filter_row (GtkTreeModel *model, @@ -1823,18 +1922,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; } @@ -1846,25 +1950,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 = g_strdup(tny_header_get_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->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; } @@ -1891,13 +2009,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)); } } @@ -1929,15 +2047,14 @@ on_account_removed (TnyAccountStore *self, } } -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); @@ -1950,11 +2067,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); @@ -1972,8 +2088,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);