#include <modest-header-view.h>
#include <modest-header-view-priv.h>
#include <modest-dnd.h>
+#include <modest-tny-folder.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);
GdkEventButton *event,
gpointer user_data);
-static gint cmp_rows (GtkTreeModel *tree_model,
- GtkTreeIter *iter1,
+static gint cmp_rows (GtkTreeModel *tree_model,
+ GtkTreeIter *iter1,
GtkTreeIter *iter2,
gpointer user_data);
GdkEventFocus *event,
gpointer user_data);
+static void folder_monitor_update (TnyFolderObserver *self,
+ TnyFolderChange *change);
+
+static void tny_folder_observer_init (TnyFolderObserverIface *klass);
+
typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
struct _ModestHeaderViewPrivate {
TnyFolder *folder;
ModestHeaderViewStyle style;
TnyFolderMonitor *monitor;
- GMutex *monitor_lock;
- gint sort_colid[2][TNY_FOLDER_TYPE_NUM];
+ GMutex *observers_lock;
+
+ gint sort_colid[2][TNY_FOLDER_TYPE_NUM];
+ gint sort_type[2][TNY_FOLDER_TYPE_NUM];
+
+
};
#define MODEST_HEADER_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
(GInstanceInitFunc) modest_header_view_init,
NULL
};
+
+ static const GInterfaceInfo tny_folder_observer_info =
+ {
+ (GInterfaceInitFunc) tny_folder_observer_init, /* interface_init */
+ NULL, /* interface_finalize */
+ NULL /* interface_data */
+ };
my_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
"ModestHeaderView",
&my_info, 0);
+
+ g_type_add_interface_static (my_type, TNY_TYPE_FOLDER_OBSERVER,
+ &tny_folder_observer_info);
+
+
}
return my_type;
}
G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
}
+static void
+tny_folder_observer_init (TnyFolderObserverIface *klass)
+{
+ klass->update_func = folder_monitor_update;
+}
+
static GtkTreeViewColumn*
get_new_column (const gchar *name, GtkCellRenderer *renderer,
gboolean resizable, gint sort_col_id, gboolean show_as_text,
}
-
-
static void
remove_all_columns (ModestHeaderView *obj)
{
GList *columns, *cursor;
-
+
columns = gtk_tree_view_get_columns (GTK_TREE_VIEW(obj));
for (cursor = columns; cursor; cursor = cursor->next)
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));
g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_PTR,
self);
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->folder = NULL;
priv->monitor = NULL;
- priv->monitor_lock = g_mutex_new ();
- for (j=0; j < 2; j++)
- for (i=0; i < TNY_FOLDER_TYPE_NUM; i++)
+ priv->observers_lock = g_mutex_new ();
+
+ /* Sort parameters */
+ for (j=0; j < 2; j++) {
+ for (i=0; i < TNY_FOLDER_TYPE_NUM; i++) {
priv->sort_colid[j][i] = -1;
+ priv->sort_type[j][i] = GTK_SORT_DESCENDING;
+ }
+ }
setup_drag_and_drop (GTK_TREE_VIEW (obj));
}
self = MODEST_HEADER_VIEW(obj);
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
- g_mutex_lock (priv->monitor_lock);
+ g_mutex_lock (priv->observers_lock);
if (priv->monitor) {
tny_folder_monitor_stop (priv->monitor);
g_object_unref (G_OBJECT (priv->monitor));
}
- g_mutex_unlock (priv->monitor_lock);
- g_mutex_free (priv->monitor_lock);
+ g_mutex_unlock (priv->observers_lock);
+ g_mutex_free (priv->observers_lock);
if (priv->folder) {
+ tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj));
g_object_unref (G_OBJECT (priv->folder));
priv->folder = NULL;
}
-
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
return gtk_tree_view_get_columns (GTK_TREE_VIEW(self));
}
+
gboolean
modest_header_view_is_empty (ModestHeaderView *self)
{
/* Set new model */
gtk_tree_view_set_model (header_view, model);
-
- modest_runtime_verify_object_death (old_model, "");
- modest_runtime_verify_object_death (old_model_sort, "");
} else
gtk_tree_view_set_model (header_view, model);
return;
}
-static void
-on_progress_changed (ModestMailOperation *mail_op,
- ModestHeaderView *self)
-{
- GtkTreeModel *sortable;
- ModestHeaderViewPrivate *priv;
- GList *cols, *cursor;
- TnyList *headers;
-
- if (!modest_mail_operation_is_finished (mail_op))
- return;
-
- if (modest_mail_operation_get_error (mail_op))
- return;
-
- priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-
- headers = TNY_LIST (tny_gtk_header_list_model_new ());
-
- tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
- priv->folder, TRUE);
-
- sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers));
- g_object_unref (G_OBJECT (headers));
-
- /* 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);
- }
- g_list_free (cols);
-
- /* Set new model */
- modest_header_view_set_model (GTK_TREE_VIEW (self), sortable);
- g_object_unref (G_OBJECT (sortable));
-
- /* Add a folder observer */
- g_mutex_lock (priv->monitor_lock);
- priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (priv->folder));
- tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers));
- tny_folder_monitor_start (priv->monitor);
- g_mutex_unlock (priv->monitor_lock);
-}
-
TnyFolder*
modest_header_view_get_folder (ModestHeaderView *self)
{
static void
modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
{
+ TnyFolderType type;
TnyList *headers;
ModestHeaderViewPrivate *priv;
GList *cols, *cursor;
GtkTreeModel *sortable;
+ guint sort_colid;
+ GtkSortType sort_type;
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
folder, FALSE);
- /* Add a folder observer */
- g_mutex_lock (priv->monitor_lock);
+ /* Add IDLE observer (monitor) and another folder observer for
+ new messages (self) */
+ g_mutex_lock (priv->observers_lock);
if (priv->monitor) {
tny_folder_monitor_stop (priv->monitor);
g_object_unref (G_OBJECT (priv->monitor));
priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (folder));
tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers));
tny_folder_monitor_start (priv->monitor);
- g_mutex_unlock (priv->monitor_lock);
-
+ tny_folder_add_observer (folder, TNY_FOLDER_OBSERVER (self));
+ g_mutex_unlock (priv->observers_lock);
sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers));
g_object_unref (G_OBJECT (headers));
/* 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));
+
+ /* Restore sort column id */
+ if (cols) {
+ type = modest_tny_folder_guess_folder_type (folder);
+ 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),
+ sort_colid,
+ sort_type);
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
- col_id,
+ TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
(GtkTreeIterCompareFunc) cmp_rows,
- cursor->data, NULL);
- cursor = g_list_next(cursor);
+ cols->data, NULL);
}
- g_list_free (cols);
-
/* Set new model */
modest_header_view_set_model (GTK_TREE_VIEW (self), sortable);
g_object_unref (G_OBJECT (sortable));
+
+ /* Free */
+ g_list_free (cols);
}
void
-modest_header_view_set_sort_column_id (ModestHeaderView *self, guint sort_colid, TnyFolderType type)
+modest_header_view_sort_by_column_id (ModestHeaderView *self,
+ guint sort_colid,
+ GtkSortType sort_type)
+{
+ ModestHeaderViewPrivate *priv = NULL;
+ GtkTreeModel *sortable = NULL;
+ TnyFolderType type;
+
+ /* Get model and private data */
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+ sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+
+ /* Sort tree model */
+ type = modest_tny_folder_guess_folder_type (priv->folder);
+ 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"); */
+
+}
+
+void
+modest_header_view_set_sort_params (ModestHeaderView *self,
+ guint sort_colid,
+ GtkSortType sort_type,
+ TnyFolderType type)
{
ModestHeaderViewPrivate *priv;
ModestHeaderViewStyle style;
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
priv->sort_colid[style][type] = sort_colid;
+ priv->sort_type[style][type] = sort_type;
}
gint
-modest_header_view_get_sort_column_id (ModestHeaderView *self, TnyFolderType type)
+modest_header_view_get_sort_column_id (ModestHeaderView *self,
+ TnyFolderType type)
{
ModestHeaderViewPrivate *priv;
ModestHeaderViewStyle style;
return priv->sort_colid[style][type];
}
+GtkSortType
+modest_header_view_get_sort_type (ModestHeaderView *self,
+ TnyFolderType type)
+{
+ ModestHeaderViewPrivate *priv;
+ ModestHeaderViewStyle style;
+
+ style = modest_header_view_get_style (self);
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+ return priv->sort_type[style][type];
+}
+
void
modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
{
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
if (priv->folder) {
+ g_mutex_lock (priv->observers_lock);
+ tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (self));
g_object_unref (priv->folder);
priv->folder = NULL;
+ g_mutex_unlock (priv->observers_lock);
}
if (folder) {
ModestMailOperation *mail_op;
+ /* Set folder in the model */
modest_header_view_set_folder_intern (self, folder);
/* Pick my reference. Nothing to do with the mail operation */
g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL);
/* Create the mail operation */
- mail_op = modest_mail_operation_new ();
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
- /* Register a mail operation observer */
- g_signal_connect (mail_op, "progress-changed",
- G_CALLBACK (on_progress_changed), self);
-
/* Refresh the folder asynchronously */
modest_mail_operation_refresh_folder (mail_op, folder);
g_object_unref (mail_op);
} else {
- g_mutex_lock (priv->monitor_lock);
- modest_header_view_set_model (GTK_TREE_VIEW (self), NULL);
+ g_mutex_lock (priv->observers_lock);
if (priv->monitor) {
tny_folder_monitor_stop (priv->monitor);
g_object_unref (G_OBJECT (priv->monitor));
priv->monitor = NULL;
}
- g_mutex_unlock (priv->monitor_lock);
+ modest_header_view_set_model (GTK_TREE_VIEW (self), NULL);
+
+ g_mutex_unlock (priv->observers_lock);
}
}
gint col_id;
gint t1, t2;
gint val1, val2;
- gchar *s1, *s2;
- gint cmp;
+ gint cmp;
static int counter = 0;
- g_return_val_if_fail (G_IS_OBJECT(user_data), 0);
- col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_COLUMN));
+ g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0);
+/* 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),
g_signal_emit (header_view,
signals[STATUS_UPDATE_SIGNAL],
0, _("Sorting..."), 0, 0);
- }
- switch (col_id) {
-
- /* first one, we decide based on the time */
- case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
- 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_HEADER_OUT:
- 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:
+ 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);
+
+ /* 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;
+
+ cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) - (val2 & TNY_HEADER_FLAG_PRIORITY);
return cmp ? cmp : t1 - t2;
GtkSelectionData *selection_data,
guint info, guint time, gpointer data)
{
- GtkTreeModel *model;
+ GtkTreeModel *model = NULL;
GtkTreeIter iter;
- GtkTreePath *source_row;
+ GtkTreePath *source_row = NULL;
- source_row = get_selected_row (GTK_TREE_VIEW(widget), &model);
+ source_row = get_selected_row (GTK_TREE_VIEW (widget), &model);
if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
switch (info) {
break;
}
default:
- g_message ("default");
+ g_message ("%s: default switch case.", __FUNCTION__);
}
gtk_tree_path_free (source_row);
/* Header view drag types */
const GtkTargetEntry header_view_drag_types[] = {
{ "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_APP, MODEST_HEADER_ROW },
- { "text/uri-list", 0, MODEST_MSG },
-
+ { "text/uri-list", 0, MODEST_MSG },
};
static void
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);
+
+ 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 ();
+ }
+
+ g_mutex_unlock (priv->observers_lock);
+}