#include <modest-dnd.h>
#include <modest-tny-folder.h>
+#include <modest-main-window.h>
+
#include <modest-marshal.h>
#include <modest-text-utils.h>
#include <modest-icon-names.h>
#include <modest-runtime.h>
#include "modest-platform.h"
+#include <modest-hbox-cell-renderer.h>
+#include <modest-vbox-cell-renderer.h>
static void modest_header_view_class_init (ModestHeaderViewClass *klass);
static void modest_header_view_init (ModestHeaderView *obj);
static void modest_header_view_finalize (GObject *obj);
-static gboolean on_header_clicked (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data);
+static void on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path,
+ GtkTreeViewColumn *column, gpointer userdata);
-static gint cmp_rows (GtkTreeModel *tree_model,
- GtkTreeIter *iter1,
+static gint cmp_rows (GtkTreeModel *tree_model,
+ GtkTreeIter *iter1,
GtkTreeIter *iter2,
gpointer user_data);
static void tny_folder_observer_init (TnyFolderObserverIface *klass);
+
typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
struct _ModestHeaderViewPrivate {
TnyFolder *folder;
};
+typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
+struct _HeadersCountChangedHelper {
+ ModestHeaderView *self;
+ TnyFolderChange *change;
+};
+
+
#define MODEST_HEADER_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_HEADER_VIEW, \
ModestHeaderViewPrivate))
HEADER_SELECTED_SIGNAL,
HEADER_ACTIVATED_SIGNAL,
ITEM_NOT_FOUND_SIGNAL,
- STATUS_UPDATE_SIGNAL,
+ MSG_COUNT_CHANGED_SIGNAL,
LAST_SIGNAL
};
g_cclosure_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
- signals[STATUS_UPDATE_SIGNAL] =
- g_signal_new ("status_update",
+ signals[MSG_COUNT_CHANGED_SIGNAL] =
+ g_signal_new ("msg_count_changed",
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (ModestHeaderViewClass,status_update),
+ G_STRUCT_OFFSET (ModestHeaderViewClass, msg_count_changed),
NULL, NULL,
- modest_marshal_VOID__STRING_INT_INT,
- G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
+ modest_marshal_VOID__POINTER_POINTER,
+ G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
}
static void
}
-
-
static void
remove_all_columns (ModestHeaderView *obj)
{
GtkTreeViewColumn *column=NULL;
GtkTreeSelection *selection = NULL;
GtkCellRenderer *renderer_msgtype,*renderer_header,
- *renderer_attach, *renderer_comptact_flag,
- *renderer_compact_date;
+ *renderer_attach, *renderer_compact_date;
+ GtkCellRenderer *renderer_compact_header, *renderer_recpt_box,
+ *renderer_subject, *renderer_subject_box, *renderer_recpt,
+ *renderer_priority;
ModestHeaderViewPrivate *priv;
+ GtkTreeViewColumn *compact_column = NULL;
const GList *cursor;
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
/* FIXME: check whether these renderers need to be freed */
renderer_msgtype = gtk_cell_renderer_pixbuf_new ();
renderer_attach = gtk_cell_renderer_pixbuf_new ();
+ renderer_priority = gtk_cell_renderer_pixbuf_new ();
renderer_header = gtk_cell_renderer_text_new ();
- renderer_comptact_flag = gtk_cell_renderer_pixbuf_new ();
+
+ renderer_compact_header = modest_vbox_cell_renderer_new ();
+ renderer_recpt_box = modest_hbox_cell_renderer_new ();
+ 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 ();
+ 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);
+ modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_recpt_box, FALSE);
+ g_object_set_data (G_OBJECT (renderer_compact_header), "recpt-box-renderer", renderer_recpt_box);
+ modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), renderer_priority, FALSE);
+ g_object_set_data (G_OBJECT (renderer_subject_box), "priority-renderer", renderer_priority);
+ modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), renderer_subject, TRUE);
+ g_object_set_data (G_OBJECT (renderer_subject_box), "subject-renderer", renderer_subject);
+ modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_attach, FALSE);
+ 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);
+
g_object_set(G_OBJECT(renderer_header),
"ellipsize", PANGO_ELLIPSIZE_END,
NULL);
+ g_object_set (G_OBJECT (renderer_subject),
+ "ellipsize", PANGO_ELLIPSIZE_END,
+ NULL);
+ g_object_set (G_OBJECT (renderer_recpt),
+ "ellipsize", PANGO_ELLIPSIZE_END,
+ NULL);
g_object_set(G_OBJECT(renderer_compact_date),
"xalign", 1.0,
NULL);
+
+ gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 32);
+ gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 32);
remove_all_columns (self);
GINT_TO_POINTER(FALSE));
break;
- case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG:
- column = get_new_column (_("F"), renderer_comptact_flag, FALSE,
- TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
- FALSE,
- (GtkTreeCellDataFunc)_modest_header_view_compact_flag_cell_data,
- NULL);
- gtk_tree_view_column_set_fixed_width (column, 45);
- break;
-
case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
- column = get_new_column (_("Header"), renderer_header, TRUE,
- TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
- TRUE,
- (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
- GINT_TO_POINTER(TRUE));
+ 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(TRUE));
+ compact_column = column;
break;
case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
- column = get_new_column (_("Header"), renderer_header, TRUE,
- TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
- TRUE,
- (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
- GINT_TO_POINTER(FALSE));
+ 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));
+ compact_column = column;
break;
GINT_TO_POINTER(FALSE));
break;
- case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE:
- column = get_new_column (_("Received"), renderer_compact_date, FALSE,
- TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
- TRUE,
- (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data,
- GINT_TO_POINTER(TRUE));
- gtk_tree_view_column_set_fixed_width (column, 130);
- break;
-
- case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE:
- column = get_new_column (_("Sent"), renderer_compact_date, FALSE,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
- TRUE,
- (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data,
- GINT_TO_POINTER(FALSE));
- gtk_tree_view_column_set_fixed_width (column, 130);
- break;
case MODEST_HEADER_VIEW_COLUMN_SIZE:
column = get_new_column (_("Size"), renderer_header, TRUE,
TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
g_return_val_if_reached(FALSE);
}
- if (sortable) {
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
- col,
- (GtkTreeIterCompareFunc) cmp_rows,
- column, NULL);
- }
-
/* we keep the column id around */
g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_COLUMN,
GINT_TO_POINTER(col));
gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);
}
+ if (sortable) {
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+ TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
+ (GtkTreeIterCompareFunc) cmp_rows,
+ compact_column, NULL);
+ }
+
+
return TRUE;
}
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
modest_header_view_set_style (self, style);
- modest_header_view_set_folder (self, NULL);
+ modest_header_view_set_folder (self, NULL, NULL, NULL);
gtk_tree_view_columns_autosize (GTK_TREE_VIEW(obj));
gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(obj),TRUE);
g_signal_connect (sel, "changed",
G_CALLBACK(on_selection_changed), self);
- g_signal_connect (self, "button-press-event",
- G_CALLBACK(on_header_clicked), NULL);
+ g_signal_connect (self, "row-activated",
+ G_CALLBACK (on_header_row_activated), NULL);
g_signal_connect (self, "focus-in-event",
G_CALLBACK(on_focus_in), NULL);
/* install our special sorting functions */
cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self));
- while (cursor) {
- gint col_id = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cursor->data),
- MODEST_HEADER_VIEW_COLUMN));
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
- col_id,
- (GtkTreeIterCompareFunc) cmp_rows,
- cursor->data, NULL);
- cursor = g_list_next(cursor);
- }
/* Restore sort column id */
if (cols) {
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
sort_colid,
sort_type);
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+ TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
+ (GtkTreeIterCompareFunc) cmp_rows,
+ cols->data, NULL);
}
/* Set new model */
g_object_unref (G_OBJECT (sortable));
/* Free */
- g_list_free (cols);
+ g_list_free (cols);
}
void
}
void
-modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
+modest_header_view_set_folder (ModestHeaderView *self,
+ TnyFolder *folder,
+ RefreshAsyncUserCallback callback,
+ gpointer user_data)
{
ModestHeaderViewPrivate *priv;
-
+ ModestMailOperation *mail_op = NULL;
+ ModestWindowMgr *mgr = NULL;
+ GObject *source = NULL;
+
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
if (priv->folder) {
}
if (folder) {
- ModestMailOperation *mail_op;
+
+ /* 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);
/* no message selected */
g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL);
- /* Create the mail operation */
- mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL);
+ /* 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 (),
mail_op);
/* Refresh the folder asynchronously */
- modest_mail_operation_refresh_folder (mail_op, folder);
+ modest_mail_operation_refresh_folder (mail_op, folder,
+ callback,
+ user_data);
/* Free */
g_object_unref (mail_op);
}
}
-static gboolean
-on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+static void
+on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path,
+ GtkTreeViewColumn *column, gpointer userdata)
{
ModestHeaderView *self = NULL;
ModestHeaderViewPrivate *priv = NULL;
- GtkTreePath *path = NULL;
GtkTreeIter iter;
GtkTreeModel *model = NULL;
TnyHeader *header;
- /* ignore everything but doubleclick */
- if (event->type != GDK_2BUTTON_PRESS)
- return FALSE;
- self = MODEST_HEADER_VIEW (widget);
+ self = MODEST_HEADER_VIEW (treeview);
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+ model = gtk_tree_view_get_model (treeview);
- path = get_selected_row (GTK_TREE_VIEW(self), &model);
if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path)))
- return FALSE;
+ return;
/* get the first selected item */
gtk_tree_model_get (model, &iter,
/* Free */
g_object_unref (G_OBJECT (header));
- gtk_tree_path_free(path);
- return TRUE;
}
-
static void
on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
{
GtkTreeIter iter;
ModestHeaderView *self;
ModestHeaderViewPrivate *priv;
+ GList *selected = NULL;
g_return_if_fail (sel);
g_return_if_fail (user_data);
self = MODEST_HEADER_VIEW (user_data);
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
- path = get_selected_row (GTK_TREE_VIEW(self), &model);
+ selected = gtk_tree_selection_get_selected_rows (sel, &model);
+ if (selected != NULL)
+ path = (GtkTreePath *) selected->data;
if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path)))
return; /* msg was _un_selected */
gint col_id;
gint t1, t2;
gint val1, val2;
- gchar *s1, *s2;
- gint cmp;
- gint sort_colid;
- static int counter = 0;
+ gint cmp;
+/* static int counter = 0; */
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0);
- col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_COLUMN));
+/* col_id = gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (tree_model)); */
+ col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_FLAG_SORT));
- if (!(++counter % 100)) {
- GObject *header_view = g_object_get_data(G_OBJECT(user_data),
- MODEST_HEADER_VIEW_PTR);
- g_signal_emit (header_view,
- signals[STATUS_UPDATE_SIGNAL],
- 0, _("Sorting..."), 0, 0);
- }
- switch (col_id) {
- case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
- case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
- sort_colid = gtk_tree_view_column_get_sort_column_id (GTK_TREE_VIEW_COLUMN(user_data));
- gtk_tree_model_get (tree_model, iter1,
- sort_colid, &s1,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
- -1);
- gtk_tree_model_get (tree_model, iter2,
- sort_colid, &s2,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
- -1);
- cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
- g_free (s1);
- g_free (s2);
-
- return cmp ? cmp : t1 - t2;
-
- break;
-
- case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE:
- case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
-
- gtk_tree_model_get (tree_model, iter1,
- TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
- &t1,-1);
- gtk_tree_model_get (tree_model, iter2,
- TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
- &t2,-1);
- return t1 - t2;
-
- case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE:
- case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
- gtk_tree_model_get (tree_model, iter1,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
- &t1,-1);
- gtk_tree_model_get (tree_model, iter2,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
- &t2,-1);
- return t1 - t2;
-
-
- /* next ones, we try the search criteria first, if they're the same, then we use 'sent date' */
- /* FIXME: what about received-date? */
- case MODEST_HEADER_VIEW_COLUMN_SUBJECT: {
-
- gtk_tree_model_get (tree_model, iter1,
- TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s1,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
- -1);
- gtk_tree_model_get (tree_model, iter2,
- TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s2,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
- -1);
-
- /* the prefix ('Re:', 'Fwd:' etc.) we ignore */
- cmp = modest_text_utils_utf8_strcmp (s1 + modest_text_utils_get_subject_prefix_len(s1),
- s2 + modest_text_utils_get_subject_prefix_len(s2),
- TRUE);
- g_free (s1);
- g_free (s2);
-
- return cmp ? cmp : t1 - t2;
- }
-
- case MODEST_HEADER_VIEW_COLUMN_FROM:
-
- gtk_tree_model_get (tree_model, iter1,
- TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &s1,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
- -1);
- gtk_tree_model_get (tree_model, iter2,
- TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &s2,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
- -1);
- cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
- g_free (s1);
- g_free (s2);
-
- return cmp ? cmp : t1 - t2;
-
- case MODEST_HEADER_VIEW_COLUMN_TO:
-
- gtk_tree_model_get (tree_model, iter1,
- TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &s1,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
- -1);
- gtk_tree_model_get (tree_model, iter2,
- TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &s2,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
- -1);
- cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
- g_free (s1);
- g_free (s2);
-
- return cmp ? cmp : t1 - t2;
-
- case MODEST_HEADER_VIEW_COLUMN_ATTACH:
+/* if (!(++counter % 100)) { */
+/* GObject *header_view = g_object_get_data(G_OBJECT(user_data), */
+/* MODEST_HEADER_VIEW_PTR); */
+/* g_signal_emit (header_view, */
+/* signals[STATUS_UPDATE_SIGNAL], */
+/* 0, _("Sorting..."), 0, 0); */
+/* } */
+ switch (col_id) {
+ case TNY_HEADER_FLAG_ATTACHMENTS:
gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, -1);
gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1);
-
+
cmp = (val1 & TNY_HEADER_FLAG_ATTACHMENTS) -
(val2 & TNY_HEADER_FLAG_ATTACHMENTS);
return cmp ? cmp : t1 - t2;
- case MODEST_HEADER_VIEW_COLUMN_MSGTYPE:
+ case TNY_HEADER_FLAG_PRIORITY:
gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,-1);
gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,-1);
- cmp = (val1 & TNY_HEADER_FLAG_SEEN) - (val2 & TNY_HEADER_FLAG_SEEN);
- return cmp ? cmp : t1 - t2;
+ /* This is for making priority values respect the intuitive sort relationship
+ * as HIGH is 11, LOW is 01, and we put NORMAL AS 10 (2) */
+ if (val1 == 0) val1 = 2;
+ if (val2 == 0) val2 = 2;
- case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG:
- gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, -1);
- gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
- TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1);
+ cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) - (val2 & TNY_HEADER_FLAG_PRIORITY);
- int flag_sort = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_FLAG_SORT));
- switch (flag_sort) {
- case TNY_HEADER_FLAG_ATTACHMENTS:
- cmp = (val1 & TNY_HEADER_FLAG_ATTACHMENTS) -
- (val2 & TNY_HEADER_FLAG_ATTACHMENTS);
- break;
- case TNY_HEADER_FLAG_PRIORITY:
- cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) -
- (val2 & TNY_HEADER_FLAG_PRIORITY);
- break;
- default:
- cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) -
- (val2 & TNY_HEADER_FLAG_PRIORITY);
- }
-
return cmp ? cmp : t1 - t2;
+
default:
return &iter1 - &iter2; /* oughhhh */
}
/* Need to get the all the rows because is selection multiple */
selected = gtk_tree_selection_get_selected_rows (selection, &model);
+ if (selected == NULL) return FALSE;
selected_path = (GtkTreePath *) selected->data;
/* Check if we need to scroll */
return FALSE;
}
-/*
- *
- */
+static gboolean
+idle_notify_added_headers (gpointer data)
+{
+ modest_platform_on_new_msg ();
+
+ return FALSE;
+}
+
+static void
+idle_notify_headers_count_changed_destroy (gpointer data)
+{
+ HeadersCountChangedHelper *helper = NULL;
+
+ g_return_if_fail (data != NULL);
+ helper = (HeadersCountChangedHelper *) data;
+
+ g_object_unref (helper->change);
+ g_slice_free (HeadersCountChangedHelper, helper);
+}
+
+static gboolean
+idle_notify_headers_count_changed (gpointer data)
+{
+ TnyFolder *folder = NULL;
+ ModestHeaderViewPrivate *priv = NULL;
+ HeadersCountChangedHelper *helper = NULL;
+
+ g_return_val_if_fail (data != NULL, FALSE);
+ helper = (HeadersCountChangedHelper *) data;
+ g_return_val_if_fail (MODEST_IS_HEADER_VIEW(helper->self), FALSE);
+ g_return_val_if_fail (TNY_FOLDER_CHANGE(helper->change), FALSE);
+
+ folder = tny_folder_change_get_folder (helper->change);
+
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE (helper->self);
+ g_mutex_lock (priv->observers_lock);
+
+ g_signal_emit (G_OBJECT(helper->self), signals[MSG_COUNT_CHANGED_SIGNAL], 0, folder, helper->change);
+
+ g_mutex_unlock (priv->observers_lock);
+
+ return FALSE;
+}
+
static void
folder_monitor_update (TnyFolderObserver *self,
TnyFolderChange *change)
{
- ModestHeaderViewPrivate *priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
TnyFolderChangeChanged changed;
-
- g_mutex_lock (priv->observers_lock);
+ HeadersCountChangedHelper *helper = NULL;
changed = tny_folder_change_get_changed (change);
- if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) {
-/* TnyIterator *iter; */
-/* TnyList *list; */
-/* /\* The added headers *\/ */
-/* list = tny_simple_list_new (); */
-/* tny_folder_change_get_added_headers (change, list); */
-/* iter = tny_list_create_iterator (list); */
-/* while (!tny_iterator_is_done (iter)) */
-/* { */
-/* TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); */
-/* g_object_unref (G_OBJECT (header)); */
-/* tny_iterator_next (iter); */
-/* } */
-/* g_object_unref (G_OBJECT (iter)); */
-/* g_object_unref (G_OBJECT (list)); */
- modest_platform_on_new_msg ();
- }
+ /* We need an idle because this function is called from within
+ a thread, so it could cause problems if the modest platform
+ code calls dbus for example */
+ if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS)
+ g_idle_add (idle_notify_added_headers, NULL);
+
+ /* Check folder count */
+ if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) ||
+ (changed & TNY_FOLDER_CHANGE_CHANGED_REMOVED_HEADERS)) {
+ helper = g_slice_new0 (HeadersCountChangedHelper);
+ helper->self = MODEST_HEADER_VIEW(self);
+ helper->change = g_object_ref(change);
+
+ g_idle_add_full (G_PRIORITY_DEFAULT,
+ idle_notify_headers_count_changed,
+ helper,
+ idle_notify_headers_count_changed_destroy);
+ }
+}
- g_mutex_unlock (priv->observers_lock);
+void
+modest_header_view_clear (ModestHeaderView *self)
+{
+ modest_header_view_set_folder (self, NULL, NULL, NULL);
}