#include <tny-list.h>
#include <tny-simple-list.h>
#include <tny-folder-monitor.h>
+#include <tny-folder-change.h>
#include <string.h>
#include <modest-header-view.h>
GtkTreeViewColumn *column=NULL;
GtkTreeSelection *selection = NULL;
GtkCellRenderer *renderer_msgtype,*renderer_header,
- *renderer_attach, *renderer_compact_date;
+ *renderer_attach, *renderer_compact_date_or_status;
GtkCellRenderer *renderer_compact_header, *renderer_recpt_box,
*renderer_subject, *renderer_subject_box, *renderer_recpt,
*renderer_priority;
renderer_subject_box = modest_hbox_cell_renderer_new ();
renderer_recpt = gtk_cell_renderer_text_new ();
renderer_subject = gtk_cell_renderer_text_new ();
- renderer_compact_date = gtk_cell_renderer_text_new ();
+ renderer_compact_date_or_status = gtk_cell_renderer_text_new ();
modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_subject_box, FALSE);
g_object_set_data (G_OBJECT (renderer_compact_header), "subject-box-renderer", renderer_subject_box);
g_object_set_data (G_OBJECT (renderer_recpt_box), "attach-renderer", renderer_attach);
modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_recpt, TRUE);
g_object_set_data (G_OBJECT (renderer_recpt_box), "recipient-renderer", renderer_recpt);
- modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date, FALSE);
- g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date);
+ modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date_or_status, FALSE);
+ g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status);
g_object_set(G_OBJECT(renderer_header),
"ellipsize", PANGO_ELLIPSIZE_END,
g_object_set (G_OBJECT (renderer_recpt),
"ellipsize", PANGO_ELLIPSIZE_END,
NULL);
- g_object_set(G_OBJECT(renderer_compact_date),
+ g_object_set(G_OBJECT(renderer_compact_date_or_status),
"xalign", 1.0,
NULL);
TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
FALSE,
(GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
- GINT_TO_POINTER(TRUE));
+ GINT_TO_POINTER(MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_IN));
compact_column = column;
break;
case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
column = get_new_column (_("Header"), renderer_compact_header, TRUE,
- TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
- FALSE,
- (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
- GINT_TO_POINTER(FALSE));
+ TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
+ FALSE,
+ (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
+ GINT_TO_POINTER((type == TNY_FOLDER_TYPE_OUTBOX)?
+ MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX:
+ MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUT));
compact_column = column;
break;
NULL);
break;
case MODEST_HEADER_VIEW_COLUMN_STATUS:
- column = get_new_column (_("Status"), renderer_compact_date, TRUE,
+ column = get_new_column (_("Status"), renderer_compact_date_or_status, TRUE,
TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
FALSE,
(GtkTreeCellDataFunc)_modest_header_view_status_cell_data,
} SetFolderHelper;
static void
-folder_refreshed_cb (const GObject *obj,
+folder_refreshed_cb (ModestMailOperation *mail_op,
TnyFolder *folder,
gpointer user_data)
{
/* User callback */
if (info->cb)
- info->cb (obj, folder, info->user_data);
+ info->cb (mail_op, folder, info->user_data);
/* Start the folder count changes observer. We do not need it
before the refresh. Note that the monitor could still be
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 ();
info->cb = callback;
info->user_data = user_data;
+ /* bug 57631: Clear the selection if exists */
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+ gtk_tree_selection_unselect_all(selection);
+
/* Create the mail operation (source will be the parent widget) */
mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, source);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
ModestHeaderViewPrivate *priv = NULL;
GtkTreeIter iter;
GtkTreeModel *model = NULL;
- TnyHeader *header;
+ TnyHeader *header = NULL;
+ TnyHeaderFlags flags;
self = MODEST_HEADER_VIEW (treeview);
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
- model = gtk_tree_view_get_model (treeview);
-
+ model = gtk_tree_view_get_model (treeview);
if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path)))
- return;
-
+ goto frees;
+
/* get the first selected item */
gtk_tree_model_get (model, &iter,
- TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
- &header, -1);
+ TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+ TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header,
+ -1);
+
+ /* Dont open DELETED messages */
+ if (flags & TNY_HEADER_FLAG_DELETED) {
+ modest_platform_information_banner (NULL, NULL, _("mcen_ib_message_already_deleted"));
+ goto frees;
+ }
+
/* Emit signal */
g_signal_emit (G_OBJECT(self),
signals[HEADER_ACTIVATED_SIGNAL],
0, header);
/* Free */
- g_object_unref (G_OBJECT (header));
+ frees:
+ if (header != NULL)
+ g_object_unref (G_OBJECT (header));
}
GtkTreeModel *model = NULL;
GtkTreeIter iter;
GtkTreePath *source_row = NULL;
+ GtkTreeSelection *sel = NULL;
source_row = get_selected_row (GTK_TREE_VIEW (widget), &model);
if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
g_message ("%s: default switch case.", __FUNCTION__);
}
+ /* Set focus on next header */
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW (widget));
+ gtk_tree_path_next (source_row);
+ gtk_tree_selection_select_path (sel, source_row);
+
gtk_tree_path_free (source_row);
}
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_mutex_lock (priv->observers_lock);
/* Emit signal to evaluate how headers changes affects to the window view */
- gdk_threads_enter ();
g_signal_emit (G_OBJECT(helper->self),
signals[MSG_COUNT_CHANGED_SIGNAL],
0, folder, helper->change);
- gdk_threads_leave ();
/* Added or removed headers, so data stored on cliboard are invalid */
if (modest_email_clipboard_check_source_folder (priv->clipboard, folder))
/* Check folder count */
if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) ||
- (changed & TNY_FOLDER_CHANGE_CHANGED_REMOVED_HEADERS)) {
+ (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)) {
helper = g_slice_new0 (HeadersCountChangedHelper);
helper->self = MODEST_HEADER_VIEW(self);
helper->change = g_object_ref(change);
modest_header_view_cut_selection (ModestHeaderView *header_view)
{
ModestHeaderViewPrivate *priv = NULL;
- GtkTreeModel *model = NULL;
const gchar **hidding = NULL;
guint i, n_selected;
priv->hidding_ids[i] = g_strdup(hidding[i]);
/* Hide cut headers */
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
- if (GTK_IS_TREE_MODEL_FILTER (model))
- gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+ modest_header_view_refilter (header_view);
}
gpointer user_data)
{
ModestHeaderViewPrivate *priv = NULL;
+ TnyHeaderFlags flags;
TnyHeader *header = NULL;
guint i;
gchar *id = NULL;
+ gboolean visible = TRUE;
gboolean found = FALSE;
g_return_val_if_fail (MODEST_IS_HEADER_VIEW (user_data), FALSE);
priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data);
- /* If no data on clipboard, return always TRUE */
- if (modest_email_clipboard_cleared(priv->clipboard)) return TRUE;
-
/* 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);
+ /* Hide mark as deleted heders */
+ if (flags & TNY_HEADER_FLAG_DELETED) {
+ visible = FALSE;
+ goto frees;
+ }
+
+ /* If no data on clipboard, return always TRUE */
+ if (modest_email_clipboard_cleared(priv->clipboard)) {
+ visible = TRUE;
+ goto frees;
+ }
+
/* Get message id from header (ensure is a valid id) */
if (!header) return FALSE;
id = g_strdup(tny_header_get_message_id (header));
/* Check hiding */
- if (priv->hidding_ids != NULL)
+ if (priv->hidding_ids != NULL) {
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;
+ }
+
/* Free */
- g_object_unref (header);
+ frees:
+ if (header)
+ g_object_unref (header);
g_free(id);
- return !found;
+ return visible;
}
static void
g_free(priv->hidding_ids);
}
}
+
+void
+modest_header_view_refilter (ModestHeaderView *header_view)
+{
+ GtkTreeModel *model;
+
+ g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
+
+ /* Hide cut headers */
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+ if (GTK_IS_TREE_MODEL_FILTER (model))
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+}
projects / modest / blobdiff