X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-header-tree-view.c;h=3b17f388e85bb94e8d6ff366c2f4065f7d85110e;hb=9ace35d55a2ef6a91ccf6713afc3983729ba1528;hp=bc80e916af65a200840f514ddf0f988cf5dcde05;hpb=5db824378b9738441c43b3b7db8ca90caecab85e;p=modest diff --git a/src/modest-tny-header-tree-view.c b/src/modest-tny-header-tree-view.c index bc80e91..3b17f38 100644 --- a/src/modest-tny-header-tree-view.c +++ b/src/modest-tny-header-tree-view.c @@ -1,9 +1,14 @@ + /* modest-tny-header-tree-view.c */ #include #include "modest-tny-header-tree-view.h" #include #include +#include "modest-marshal.h" + +#include +#include "modest-icon-factory.h" /* 'private'/'protected' functions */ static void modest_tny_header_tree_view_class_init (ModestTnyHeaderTreeViewClass *klass); @@ -12,32 +17,23 @@ static void modest_tny_header_tree_view_finalize (GObject *obj); static void selection_changed (GtkTreeSelection *sel, gpointer user_data); static void column_clicked (GtkTreeViewColumn *treeviewcolumn, gpointer user_data); - -#define PIXMAP_PREFIX PREFIX "/share/modest/pixmaps/" +static gboolean refresh_folder_finish_status_update (gpointer user_data); enum { MESSAGE_SELECTED_SIGNAL, + STATUS_UPDATE_SIGNAL, LAST_SIGNAL }; -enum { - HEADER_ICON_READ, - HEADER_ICON_UNREAD, - HEADER_ICON_ATTACH, - HEADER_ICON_NUM -}; - - typedef struct _ModestTnyHeaderTreeViewPrivate ModestTnyHeaderTreeViewPrivate; struct _ModestTnyHeaderTreeViewPrivate { TnyMsgFolderIface *tny_msg_folder; TnyListIface *headers; - GdkPixbuf *icons[HEADER_ICON_NUM]; - guint sort_columns[MODEST_TNY_HEADER_TREE_VIEW_COLUMN_NUM]; - - GSList *columns; + gint status_id; + GSList *columns; + ModestTnyHeaderTreeViewStyle style; }; #define MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -80,9 +76,9 @@ modest_tny_header_tree_view_class_init (ModestTnyHeaderTreeViewClass *klass) parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_tny_header_tree_view_finalize; - + g_type_class_add_private (gobject_class, sizeof(ModestTnyHeaderTreeViewPrivate)); - + signals[MESSAGE_SELECTED_SIGNAL] = g_signal_new ("message_selected", G_TYPE_FROM_CLASS (gobject_class), @@ -90,7 +86,16 @@ modest_tny_header_tree_view_class_init (ModestTnyHeaderTreeViewClass *klass) G_STRUCT_OFFSET (ModestTnyHeaderTreeViewClass,message_selected), NULL, NULL, g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); + G_TYPE_NONE, 1, G_TYPE_POINTER); + + signals[STATUS_UPDATE_SIGNAL] = + g_signal_new ("status_update", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestTnyHeaderTreeViewClass,message_selected), + NULL, NULL, + modest_marshal_VOID__STRING_INT, + G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT); } @@ -99,8 +104,7 @@ modest_tny_header_tree_view_class_init (ModestTnyHeaderTreeViewClass *klass) static void msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, GtkTreeIter *iter, - GdkPixbuf *icons[HEADER_ICON_NUM]) + GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { TnyMsgHeaderFlags flags; GdkPixbuf *pixbuf; @@ -108,30 +112,31 @@ msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, gtk_tree_model_get (tree_model, iter, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, -1); - if (flags & TNY_MSG_HEADER_FLAG_SEEN) - pixbuf = icons[HEADER_ICON_READ]; + if (flags & TNY_MSG_HEADER_FLAG_DELETED) + pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_DELETED); + else if (flags & TNY_MSG_HEADER_FLAG_SEEN) + pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_READ); else - pixbuf = icons[HEADER_ICON_UNREAD]; - - g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, - NULL); + pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_UNREAD); + if (pixbuf) + g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL); } static void -attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, GtkTreeIter *iter, GdkPixbuf *icons[HEADER_ICON_NUM]) +attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, + GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { TnyMsgHeaderFlags flags; - GdkPixbuf *pixbuf; + GdkPixbuf *pixbuf = NULL; gtk_tree_model_get (tree_model, iter, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, -1); - if (flags & TNY_MSG_HEADER_FLAG_ATTACHMENTS) - pixbuf = icons[HEADER_ICON_ATTACH]; - else - pixbuf = NULL; - - g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL); + + if (flags & TNY_MSG_HEADER_FLAG_ATTACHMENTS) { + pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_ATTACH); + if (pixbuf) + g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL); + } } @@ -140,67 +145,97 @@ static void header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { - GObject *rendobj; TnyMsgHeaderFlags flags; gtk_tree_model_get (tree_model, iter, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, -1); - rendobj = G_OBJECT(renderer); - - if (!(flags & TNY_MSG_HEADER_FLAG_SEEN)) - g_object_set (rendobj, "weight", 800, NULL); - else - g_object_set (rendobj, "weight", 400, NULL); /* default, non-bold */ + + g_object_set (G_OBJECT(renderer), + "weight", (flags & TNY_MSG_HEADER_FLAG_SEEN) ? 400: 800, + "style", (flags & TNY_MSG_HEADER_FLAG_DELETED) ? + PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL, + NULL); } static void -sender_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) +sender_receiver_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, + GtkTreeModel *tree_model, GtkTreeIter *iter, gboolean is_sender) { - GObject *rendobj; TnyMsgHeaderFlags flags; - gchar *from; - gchar *address; - + gchar *addr1, *addr2; + gint sender_receiver_col; + + if (is_sender) + sender_receiver_col = TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN; + else + sender_receiver_col = TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN; + gtk_tree_model_get (tree_model, iter, - TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, &from, + sender_receiver_col, &addr1, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, - TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, &flags -1); - rendobj = G_OBJECT(renderer); - + /* simplistic --> remove from display */ - address = g_strstr_len (from, strlen(from), "<"); - if (address) { - address[0]='\0'; - g_object_set (rendobj, "text", from, NULL); - g_free (from); - } - - if (!(flags & TNY_MSG_HEADER_FLAG_SEEN)) - g_object_set (rendobj, "weight", 800, NULL); - else - g_object_set (rendobj, "weight", 400, NULL); /* default, non-bold */ + addr2 = g_strstr_len (addr1, strlen(addr1), "<"); + if (addr2) + addr2[0]='\0'; + + g_object_set (G_OBJECT(renderer), + "text", addr1, + "weight", (flags & TNY_MSG_HEADER_FLAG_SEEN) ? 400 : 800, + "style", (flags & TNY_MSG_HEADER_FLAG_DELETED) ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL, + NULL); + + g_free (addr1); } +/* not reentrant/thread-safe */ +const gchar* +display_date (time_t date) +{ + struct tm date_tm, now_tm; + time_t now; + const gint buf_size = 64; + static gchar date_buf[64]; /* buf_size is not ... */ + static gchar now_buf[64]; /* ...const enough... */ + + now = time (NULL); + + localtime_r(&now, &now_tm); + localtime_r(&date, &date_tm); + + /* get today's date */ + strftime (date_buf, buf_size, "%x", &date_tm); + strftime (now_buf, buf_size, "%x", &now_tm); /* today */ + + /* if this is today, get the time instead of the date */ + if (strcmp (date_buf, now_buf) == 0) + strftime (date_buf, buf_size, _("%X"), &date_tm); + + return date_buf; +} + + +static void compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { GObject *rendobj; TnyMsgHeaderFlags flags; - gchar *from, *subject, *date; + gchar *from, *subject; gchar *address; gchar *header; - + time_t date; + gtk_tree_model_get (tree_model, iter, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, &from, TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject, - TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN, &date, + TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, &date, -1); rendobj = G_OBJECT(renderer); @@ -209,37 +244,20 @@ compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer if (address) address[0]='\0'; /* set a new endpoint */ - header = g_strdup_printf ("%s %s\n%s", from, date, subject); - g_object_set (rendobj, "text", header, NULL); - + header = g_strdup_printf ("%s %s\n%s", from, + display_date(date), subject); + g_object_set (G_OBJECT(renderer), + "text", header, + "weight", (flags & TNY_MSG_HEADER_FLAG_SEEN) ? 400: 800, + "style", (flags & TNY_MSG_HEADER_FLAG_DELETED) ? + PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL, + NULL); g_free (header); g_free (from); g_free (subject); - g_free (date); - - if (!(flags & TNY_MSG_HEADER_FLAG_SEEN)) - g_object_set (rendobj, "weight", 800, NULL); - else - g_object_set (rendobj, "weight", 400, NULL); /* default, non-bold */ } - - - -static void -init_icons (GdkPixbuf *icons[HEADER_ICON_NUM]) -{ - icons[HEADER_ICON_UNREAD] = - gdk_pixbuf_new_from_file (PIXMAP_PREFIX "qgn_list_messagin_mail_unread.png",NULL); - icons[HEADER_ICON_READ] = - gdk_pixbuf_new_from_file (PIXMAP_PREFIX "qgn_list_messagin_mail.png",NULL); - icons[HEADER_ICON_ATTACH] = - gdk_pixbuf_new_from_file (PIXMAP_PREFIX "clip.xpm",NULL); -} - - - static GtkTreeViewColumn* get_new_column (const gchar *name, GtkCellRenderer *renderer, gboolean resizable, gint sort_col_id, gboolean show_as_text, @@ -291,7 +309,7 @@ remove_all_columns (ModestTnyHeaderTreeView *obj) static void init_columns (ModestTnyHeaderTreeView *obj) { - GtkTreeViewColumn *column; + GtkTreeViewColumn *column=NULL; GtkCellRenderer *renderer_msgtype, *renderer_header, *renderer_attach; @@ -317,51 +335,59 @@ init_columns (ModestTnyHeaderTreeView *obj) column = get_new_column (_("M"), renderer_msgtype, FALSE, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, - FALSE, (GtkTreeCellDataFunc)msgtype_cell_data, priv->icons); + FALSE, (GtkTreeCellDataFunc)msgtype_cell_data, + NULL); break; case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_ATTACH: column = get_new_column (_("A"), renderer_attach, FALSE, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, - FALSE, (GtkTreeCellDataFunc)attach_cell_data, priv->icons); + FALSE, (GtkTreeCellDataFunc)attach_cell_data, + NULL); break; case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_RECEIVED_DATE: column = get_new_column (_("Received"), renderer_header, TRUE, TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN, - TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL); + TRUE, (GtkTreeCellDataFunc)header_cell_data, + NULL); break; case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_FROM: column = get_new_column (_("From"), renderer_header, TRUE, TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, - TRUE, (GtkTreeCellDataFunc)sender_cell_data, NULL); + TRUE, (GtkTreeCellDataFunc)sender_receiver_cell_data, + GINT_TO_POINTER(TRUE)); break; + case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_TO: + column = get_new_column (_("To"), renderer_header, TRUE, + TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN, + TRUE, (GtkTreeCellDataFunc)sender_receiver_cell_data, + GINT_TO_POINTER(FALSE)); + break; + case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_COMPACT_HEADER: column = get_new_column (_("Header"), renderer_header, TRUE, TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, - TRUE, (GtkTreeCellDataFunc)compact_header_cell_data, NULL); + TRUE, (GtkTreeCellDataFunc)compact_header_cell_data, + NULL); break; case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SUBJECT: column = get_new_column (_("Subject"), renderer_header, TRUE, TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, - TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL); + TRUE, (GtkTreeCellDataFunc)header_cell_data, + NULL); break; case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SENT_DATE: column = get_new_column (_("Sent"), renderer_header, TRUE, TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_COLUMN, - TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL); - break; - - case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_TO: - column = get_new_column (_("To"), renderer_header, TRUE, - TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN, - TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL); + TRUE, (GtkTreeCellDataFunc)header_cell_data, + NULL); break; } gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column); @@ -376,15 +402,9 @@ static void modest_tny_header_tree_view_init (ModestTnyHeaderTreeView *obj) { ModestTnyHeaderTreeViewPrivate *priv; - int i; - priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(obj); - - for (i = 0; i != MODEST_TNY_HEADER_TREE_VIEW_COLUMN_NUM; ++i) - priv->sort_columns[i] = -1; - - init_icons (priv->icons); + priv->status_id = 0; } static void @@ -392,7 +412,6 @@ modest_tny_header_tree_view_finalize (GObject *obj) { ModestTnyHeaderTreeView *self; ModestTnyHeaderTreeViewPrivate *priv; - int i; self = MODEST_TNY_HEADER_TREE_VIEW(obj); priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self); @@ -402,14 +421,6 @@ modest_tny_header_tree_view_finalize (GObject *obj) priv->headers = NULL; priv->tny_msg_folder = NULL; - - /* cleanup our icons */ - for (i = 0; i != HEADER_ICON_NUM; ++i) { - if (priv->icons[i]) { - g_object_unref (G_OBJECT(priv->icons[i])); - priv->icons[i] = NULL; - } - } } GtkWidget* @@ -443,7 +454,7 @@ modest_tny_header_tree_view_new (TnyMsgFolderIface *folder, sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); g_signal_connect (sel, "changed", G_CALLBACK(selection_changed), self); - + return GTK_WIDGET(self); } @@ -478,7 +489,6 @@ const GSList* modest_tny_header_tree_view_get_columns (ModestTnyHeaderTreeView *self) { ModestTnyHeaderTreeViewPrivate *priv; - GSList *cursor; g_return_val_if_fail (self, FALSE); @@ -513,11 +523,11 @@ modest_tny_header_tree_view_get_style (ModestTnyHeaderTreeView *self) /* get the length of any prefix that should be ignored for sorting */ -static int +static inline int get_prefix_len (const gchar *sub) { - int i = 0; - const static gchar* prefix[] = {"Re:", "RE:", "Fwd:", "FWD:", NULL}; + gint i = 0; + const static gchar* prefix[] = {"Re:", "RE:", "Fwd:", "FWD:", "FW:", "AW:", NULL}; if (sub[0] != 'R' && sub[0] != 'F') /* optimization */ return 0; @@ -525,21 +535,30 @@ get_prefix_len (const gchar *sub) while (prefix[i]) { if (g_str_has_prefix(sub, prefix[i])) { int prefix_len = strlen(prefix[i]); - if (sub[prefix_len + 1] == ' ') + if (sub[prefix_len] == ' ') ++prefix_len; /* ignore space after prefix as well */ return prefix_len; } + ++i; } return 0; } -static gint +static inline gint cmp_normalized_subject (const gchar* s1, const gchar *s2) { - /* FIXME: utf8 */ - return strcmp (s1 + get_prefix_len(s1), - s2 + get_prefix_len(s2)); + gint result = 0; + register gchar *n1, *n2; + + n1 = g_utf8_collate_key (s1 + get_prefix_len(s1), -1); + n2 = g_utf8_collate_key (s2 + get_prefix_len(s2), -1); + + result = strcmp (n1, n2); + g_free (n1); + g_free (n2); + + return result; } @@ -548,88 +567,137 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer user_data) { gint col_id = GPOINTER_TO_INT (user_data); + gint t1, t2; gint val1, val2; - + gchar *s1, *s2; + gint cmp; + g_return_val_if_fail (GTK_IS_TREE_MODEL(tree_model), -1); switch (col_id) { + /* first one, we decide based on the time */ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_COMPACT_HEADER: case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_RECEIVED_DATE: - gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN, - &val1,-1); - gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN, - &val2,-1); - return val1 - val2; - + gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, + &t1,-1); + gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, + &t2,-1); + return t1 - t2; case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SENT_DATE: - gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_COLUMN, - &val1,-1); - gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_COLUMN, - &val2,-1); - return val1 - val2; + gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, + &t1,-1); + gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, + &t2,-1); + return t1 - t2; - case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SUBJECT: { - gchar *sub1, *sub2; - int retval; - gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, - &sub1,-1); - gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, - &sub2,-1); + /* next ones, we try the search criteria first, if they're the same, then we use 'sent date' */ + case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SUBJECT: { + + gtk_tree_model_get (tree_model, iter1, + TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s1, + TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, + -1); + gtk_tree_model_get (tree_model, iter2, + TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s2, + TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, + -1); - retval = cmp_normalized_subject(sub1, sub2); + cmp = cmp_normalized_subject(s1, s2); - g_free (sub1); - g_free (sub2); + g_free (s1); + g_free (s2); - return retval; + return cmp ? cmp : t1 - t2; } + case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_FROM: + + gtk_tree_model_get (tree_model, iter1, + TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, &s1, + TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, + -1); + gtk_tree_model_get (tree_model, iter2, + TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, &s2, + TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, + -1); + cmp = strcmp (s1, s2); + g_free (s1); + g_free (s2); + + return cmp ? cmp : t1 - t2; + + case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_TO: + + gtk_tree_model_get (tree_model, iter1, + TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN, &s1, + TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, + -1); + gtk_tree_model_get (tree_model, iter2, + TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN, &s2, + TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, + -1); + cmp = strcmp (s1, s2); + g_free (s1); + g_free (s2); + + return cmp ? cmp : t1 - t2; + case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_ATTACH: - gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, - &val1,-1); - gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, - &val2,-1); + + gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1, + TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, -1); + gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2, + TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1); - return (val1 & TNY_MSG_HEADER_FLAG_ATTACHMENTS) - (val2 & TNY_MSG_HEADER_FLAG_ATTACHMENTS); - + cmp = (val1 & TNY_MSG_HEADER_FLAG_ATTACHMENTS) - (val2 & TNY_MSG_HEADER_FLAG_ATTACHMENTS); + return cmp ? cmp : t1 - t2; + case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_MSGTYPE: - gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, - &val1,-1); - gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, - &val2,-1); + gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1, + TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,-1); + gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2, + TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,-1); + cmp = (val1 & TNY_MSG_HEADER_FLAG_SEEN) - (val2 & TNY_MSG_HEADER_FLAG_SEEN); - g_message ("%p %p", iter1, iter2); - return (val1 & TNY_MSG_HEADER_FLAG_SEEN) - (val2 & TNY_MSG_HEADER_FLAG_SEEN); + return cmp ? cmp : t1 - t2; default: - g_message ("%p %p", iter1, iter2); - return &iter1 - &iter2; + return &iter1 - &iter2; /* oughhhh */ } } -gboolean -modest_tny_header_tree_view_set_folder (ModestTnyHeaderTreeView *self, - TnyMsgFolderIface *folder) +static void +refresh_folder (TnyMsgFolderIface *folder, gboolean cancelled, + gpointer user_data) { - int i; - GtkTreeModel *oldsortable, *sortable, *oldmodel; + GtkTreeModel *oldsortable, *sortable; + ModestTnyHeaderTreeView *self = + MODEST_TNY_HEADER_TREE_VIEW(user_data); ModestTnyHeaderTreeViewPrivate *priv; - - g_return_val_if_fail (self, FALSE); + g_return_if_fail (self); + + if (cancelled) + return; + priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self); + + if (!folder) /* when there is no folder */ + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE); - if (folder) { + else { /* it's a new one or a refresh */ + GSList *col; + priv->headers = TNY_LIST_IFACE(tny_msg_header_list_model_new ()); - tny_msg_folder_iface_get_headers (folder, priv->headers, - FALSE); + + tny_msg_folder_iface_get_headers (folder, priv->headers, FALSE); tny_msg_header_list_model_set_folder (TNY_MSG_HEADER_LIST_MODEL(priv->headers), - folder, TRUE); + folder, TRUE); /* async */ oldsortable = gtk_tree_view_get_model(GTK_TREE_VIEW (self)); if (oldsortable && GTK_IS_TREE_MODEL_SORT(oldsortable)) { @@ -641,28 +709,96 @@ modest_tny_header_tree_view_set_folder (ModestTnyHeaderTreeView *self, } sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(priv->headers)); - - for (i = 0; i != MODEST_TNY_HEADER_TREE_VIEW_COLUMN_NUM; ++i) { - int col_id = priv->sort_columns[i]; - if (col_id >= 0) { - g_message ("%d: %p: %p: %d", i, GTK_TREE_SORTABLE(sortable), sortable, col_id); - gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), col_id, - (GtkTreeIterCompareFunc)cmp_rows, - GINT_TO_POINTER(col_id), NULL); - } + + /* install our special sorting functions */ + col = priv->columns; + while (col) { + gint col_id = GPOINTER_TO_INT (col->data); + gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), col_id, + (GtkTreeIterCompareFunc)cmp_rows, + GINT_TO_POINTER(col_id), NULL); + col = col->next; } + gtk_tree_view_set_model (GTK_TREE_VIEW (self), sortable); gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self), TRUE); - /* no need to unref sortable */ - - } else /* when there is no folder */ - gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self), FALSE); - + } +} + + +static void +refresh_folder_status_update (TnyMsgFolderIface *folder, const gchar *msg, + gint status_id, gpointer user_data) +{ + ModestTnyHeaderTreeView *self; + ModestTnyHeaderTreeViewPrivate *priv; + + self = MODEST_TNY_HEADER_TREE_VIEW (user_data); + priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self); + + g_signal_emit (G_OBJECT(self), + signals[STATUS_UPDATE_SIGNAL], 0, + msg, status_id); + if (msg) + g_timeout_add (750, + (GSourceFunc)refresh_folder_finish_status_update, + self); + + priv->status_id = status_id; +} + + +static gboolean +refresh_folder_finish_status_update (gpointer user_data) +{ + ModestTnyHeaderTreeView *self; + ModestTnyHeaderTreeViewPrivate *priv; + + self = MODEST_TNY_HEADER_TREE_VIEW (user_data); + priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self); + + if (priv->status_id == 0) + return FALSE; + + refresh_folder_status_update (NULL, NULL, priv->status_id, + user_data); + priv->status_id = 0; + + return FALSE; +} + + +gboolean +modest_tny_header_tree_view_set_folder (ModestTnyHeaderTreeView *self, + TnyMsgFolderIface *folder) +{ + ModestTnyHeaderTreeViewPrivate *priv; + + + g_return_val_if_fail (MODEST_IS_TNY_HEADER_TREE_VIEW (self), FALSE); + + priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self); + + if (!folder) {/* when there is no folder */ + GtkTreeModel *model; + model = gtk_tree_view_get_model (GTK_TREE_VIEW(self)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE); + gtk_tree_view_set_model (GTK_TREE_VIEW (self), NULL); + if (model) + g_object_unref (model); + } + else { /* it's a new one or a refresh */ + tny_msg_folder_iface_refresh_async (folder, + refresh_folder, + refresh_folder_status_update, + self); + } return TRUE; } + static void selection_changed (GtkTreeSelection *sel, gpointer user_data) { @@ -684,8 +820,7 @@ selection_changed (GtkTreeSelection *sel, gpointer user_data) &header, -1); if (header) { - TnyMsgHeaderFlags flags; - const TnyMsgIface *msg; + const TnyMsgIface *msg = NULL; const TnyMsgFolderIface *folder; folder = tny_msg_header_iface_get_folder (TNY_MSG_HEADER_IFACE(header)); @@ -696,7 +831,8 @@ selection_changed (GtkTreeSelection *sel, gpointer user_data) header); if (!msg) { g_message ("cannot find msg"); - /* FIXME: update display */ + gtk_tree_store_remove (GTK_TREE_STORE(model), + &iter); } } @@ -704,8 +840,8 @@ selection_changed (GtkTreeSelection *sel, gpointer user_data) msg); /* mark message as seen; _set_flags crashes, bug in tinymail? */ - flags = tny_msg_header_iface_get_flags (TNY_MSG_HEADER_IFACE(header)); - //tny_msg_header_iface_set_flags (header, flags | TNY_MSG_HEADER_FLAG_SEEN); + //flags = tny_msg_header_iface_get_flags (TNY_MSG_HEADER_IFACE(header)); + //tny_msg_header_iface_set_flags (header, TNY_MSG_HEADER_FLAG_SEEN); } }