X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=09f78c4185c5cb6cbe42341ae491ddde54e4afb7;hb=cac404b01351e3959adb4f4e577da0106ddb37ee;hp=f2acf3e5785194fd8df84eacbb714b0d3613ae7b;hpb=2e7120c1f07ef549a82508a233c7eb0b1200de92;p=modest diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index f2acf3e..09f78c4 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -27,44 +27,41 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -/* modest-tny-header-tree-view.c */ - #include -#include "modest-header-view.h" -#include +#include +#include #include -#include +#include +#include +#include #include -#include "modest-icon-factory.h" +#include 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 void on_selection_changed (GtkTreeSelection *sel, gpointer user_data); -//static void on_column_clicked (GtkTreeViewColumn *treeviewcolumn, gpointer user_data); -static gboolean refresh_folder_finish_status_update (gpointer user_data); +static void on_selection_changed (GtkTreeSelection *sel, gpointer user_data); + +#define MODEST_HEADER_VIEW_PTR "modest-header-view" enum { MESSAGE_SELECTED_SIGNAL, + ITEM_NOT_FOUND_SIGNAL, STATUS_UPDATE_SIGNAL, LAST_SIGNAL }; + typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate; struct _ModestHeaderViewPrivate { - - TnyMsgFolderIface *tny_msg_folder; - TnyListIface *headers; - - gint status_id; - GSList *columns; - - GMutex *lock; - + TnyFolder *folder; + TnyList *headers; + GMutex *lock; ModestHeaderViewStyle style; + gulong sig1; + }; #define MODEST_HEADER_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_HEADER_VIEW, \ @@ -90,6 +87,7 @@ modest_header_view_get_type (void) sizeof(ModestHeaderView), 1, /* n_preallocs */ (GInstanceInitFunc) modest_header_view_init, + NULL }; my_type = g_type_register_static (GTK_TYPE_TREE_VIEW, "ModestHeaderView", @@ -117,37 +115,42 @@ modest_header_view_class_init (ModestHeaderViewClass *klass) NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - + + signals[ITEM_NOT_FOUND_SIGNAL] = + g_signal_new ("item_not_found", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestHeaderViewClass,item_not_found), + NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, G_TYPE_INT); + signals[STATUS_UPDATE_SIGNAL] = g_signal_new ("status_update", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ModestHeaderViewClass,message_selected), NULL, NULL, - modest_marshal_VOID__STRING_INT, - G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT); + modest_marshal_VOID__STRING_INT_INT, + G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT); } - - - - static void msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { - TnyMsgHeaderFlags flags; + TnyHeaderFlags flags; GdkPixbuf *pixbuf = NULL; - - gtk_tree_model_get (tree_model, iter, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, + + gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, -1); - 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); + if (flags & TNY_HEADER_FLAG_DELETED) + pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_DELETED); + else if (flags & TNY_HEADER_FLAG_SEEN) + pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_READ); else - pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_UNREAD); + pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_UNREAD); g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL); } @@ -156,14 +159,14 @@ static void attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { - TnyMsgHeaderFlags flags; + TnyHeaderFlags flags; GdkPixbuf *pixbuf = NULL; - gtk_tree_model_get (tree_model, iter, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, + gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, -1); - if (flags & TNY_MSG_HEADER_FLAG_ATTACHMENTS) - pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_ATTACH); + if (flags & TNY_HEADER_FLAG_ATTACHMENTS) + pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_ATTACH); g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL); } @@ -173,69 +176,44 @@ static void header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { - TnyMsgHeaderFlags flags; + TnyHeaderFlags flags; - gtk_tree_model_get (tree_model, iter, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, + gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, -1); g_object_set (G_OBJECT(renderer), - "weight", (flags & TNY_MSG_HEADER_FLAG_SEEN) ? 400: 800, - "style", (flags & TNY_MSG_HEADER_FLAG_DELETED) ? + "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800, + "style", (flags & TNY_HEADER_FLAG_DELETED) ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL, NULL); } - -/* try to make a shorter display address; changes it arg in-place */ -static gchar* -display_address (gchar *address) -{ - gchar *cursor; - - if (!address) - return NULL; - - /* simplistic --> remove from display name */ - cursor = g_strstr_len (address, strlen(address), "<"); - if (cursor) - cursor[0]='\0'; - - /* simplistic --> remove (bla bla) from display name */ - cursor = g_strstr_len (address, strlen(address), "("); - if (cursor) - cursor[0]='\0'; - - return address; -} - - - static void sender_receiver_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gboolean is_sender) { - TnyMsgHeaderFlags flags; + TnyHeaderFlags flags; gchar *address; gint sender_receiver_col; if (is_sender) - sender_receiver_col = TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN; + sender_receiver_col = TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN; else - sender_receiver_col = TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN; + sender_receiver_col = TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN; gtk_tree_model_get (tree_model, iter, sender_receiver_col, &address, - TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, + TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, -1); - + g_object_set (G_OBJECT(renderer), "text", - display_address (address), + modest_text_utils_display_address (address), "weight", - (flags & TNY_MSG_HEADER_FLAG_SEEN) ? 400 : 800, + (flags & TNY_HEADER_FLAG_SEEN) ? 400 : 800, "style", - (flags & TNY_MSG_HEADER_FLAG_DELETED)?PANGO_STYLE_ITALIC:PANGO_STYLE_NORMAL, + (flags & TNY_HEADER_FLAG_DELETED)?PANGO_STYLE_ITALIC:PANGO_STYLE_NORMAL, NULL); g_free (address); @@ -243,16 +221,6 @@ sender_receiver_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *rendere -/* just to prevent warnings: - * warning: `%x' yields only last 2 digits of year in some locales - */ -static size_t -my_strftime(char *s, size_t max, const char *fmt, const - struct tm *tm) { - return strftime(s, max, fmt, tm); -} - - /* not reentrant/thread-safe */ const gchar* @@ -271,8 +239,9 @@ display_date (time_t date) localtime_r(&date, &date_tm); /* get today's date */ - my_strftime (date_buf, buf_size, "%x", &date_tm); - my_strftime (now_buf, buf_size, "%x", &now_tm); /* today */ + modest_text_utils_strftime (date_buf, buf_size, "%x", &date_tm); + modest_text_utils_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) @@ -287,28 +256,28 @@ compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { GObject *rendobj; - TnyMsgHeaderFlags flags; + TnyHeaderFlags flags; gchar *from, *subject; 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_TIME_T_COLUMN, &date, + TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, + TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &from, + TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject, + TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, &date, -1); rendobj = G_OBJECT(renderer); header = g_strdup_printf ("%s %s\n%s", - display_address (from), + modest_text_utils_display_address (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) ? + "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800, + "style", (flags & TNY_HEADER_FLAG_DELETED) ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL, NULL); g_free (header); @@ -325,8 +294,11 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer, GtkTreeViewColumn *column; column = gtk_tree_view_column_new_with_attributes(name, renderer, NULL); - gtk_tree_view_column_set_resizable (column, resizable); gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); + + gtk_tree_view_column_set_resizable (column, resizable); + if (resizable) + gtk_tree_view_column_set_min_width (column, 100); if (show_as_text) gtk_tree_view_column_add_attribute (column, renderer, "text", @@ -340,10 +312,6 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer, if (cell_data_func) gtk_tree_view_column_set_cell_data_func(column, renderer, cell_data_func, user_data, NULL); - -/* g_signal_connect (G_OBJECT (column), "clicked", */ -/* G_CALLBACK (column_clicked), obj); */ - return column; } @@ -365,9 +333,8 @@ remove_all_columns (ModestHeaderView *obj) - -static void -init_columns (ModestHeaderView *obj) +gboolean +modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) { GtkTreeViewColumn *column=NULL; GtkCellRenderer *renderer_msgtype, @@ -375,69 +342,75 @@ init_columns (ModestHeaderView *obj) *renderer_attach; ModestHeaderViewPrivate *priv; - GSList *cursor; + const GList *cursor; - priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); - + 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_header = gtk_cell_renderer_text_new (); + renderer_header = gtk_cell_renderer_text_new (); - remove_all_columns (obj); + remove_all_columns (self); - for (cursor = priv->columns; cursor; cursor = cursor->next) { + for (cursor = columns; cursor; cursor = g_list_next(cursor)) { ModestHeaderViewColumn col = (ModestHeaderViewColumn) GPOINTER_TO_INT(cursor->data); + if (0> col || col >= MODEST_HEADER_VIEW_COLUMN_NUM) { + g_printerr ("modest: invalid column %d in column list\n", col); + continue; + } + switch (col) { case MODEST_HEADER_VIEW_COLUMN_MSGTYPE: - column = get_new_column (_("M"), renderer_msgtype, FALSE, - TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, + TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, FALSE, (GtkTreeCellDataFunc)msgtype_cell_data, NULL); + gtk_tree_view_column_set_fixed_width (column, 32); break; case MODEST_HEADER_VIEW_COLUMN_ATTACH: - column = get_new_column (_("A"), renderer_attach, FALSE, - TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, + TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, FALSE, (GtkTreeCellDataFunc)attach_cell_data, NULL); + gtk_tree_view_column_set_fixed_width (column, 32); break; - + case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE: column = get_new_column (_("Received"), renderer_header, TRUE, - TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN, + TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN, TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL); break; case MODEST_HEADER_VIEW_COLUMN_FROM: column = get_new_column (_("From"), renderer_header, TRUE, - TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, + TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, TRUE, (GtkTreeCellDataFunc)sender_receiver_cell_data, GINT_TO_POINTER(TRUE)); break; case MODEST_HEADER_VIEW_COLUMN_TO: column = get_new_column (_("To"), renderer_header, TRUE, - TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN, + TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, TRUE, (GtkTreeCellDataFunc)sender_receiver_cell_data, GINT_TO_POINTER(FALSE)); break; case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER: column = get_new_column (_("Header"), renderer_header, TRUE, - TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, + TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, TRUE, (GtkTreeCellDataFunc)compact_header_cell_data, NULL); break; case MODEST_HEADER_VIEW_COLUMN_SUBJECT: column = get_new_column (_("Subject"), renderer_header, TRUE, - TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, + TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL); break; @@ -445,13 +418,27 @@ init_columns (ModestHeaderView *obj) case MODEST_HEADER_VIEW_COLUMN_SENT_DATE: column = get_new_column (_("Sent"), renderer_header, TRUE, - TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_COLUMN, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_COLUMN, TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL); break; + + default: + g_assert_not_reached (); } - gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column); + + /* we keep the column id around */ + g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_COLUMN, + GINT_TO_POINTER(col)); + + /* we need this ptr when sorting the rows */ + g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_PTR, + self); + + gtk_tree_view_column_set_visible (column, TRUE); + gtk_tree_view_append_column (GTK_TREE_VIEW(self), column); } + return TRUE; } @@ -462,8 +449,8 @@ modest_header_view_init (ModestHeaderView *obj) ModestHeaderViewPrivate *priv; priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); - priv->status_id = 0; priv->lock = g_mutex_new (); + priv->sig1 = 0; } static void @@ -471,6 +458,7 @@ modest_header_view_finalize (GObject *obj) { ModestHeaderView *self; ModestHeaderViewPrivate *priv; + GtkTreeSelection *sel; self = MODEST_HEADER_VIEW(obj); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -478,29 +466,36 @@ modest_header_view_finalize (GObject *obj) if (priv->headers) g_object_unref (G_OBJECT(priv->headers)); - + sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); + + if (sel && priv->sig1 != 0) { + g_signal_handler_disconnect (G_OBJECT(sel), priv->sig1); + priv->sig1 = 0; + } + if (priv->lock) { g_mutex_free (priv->lock); priv->lock = NULL; } - priv->headers = NULL; - priv->tny_msg_folder = NULL; - + priv->headers = NULL; + priv->folder = NULL; + G_OBJECT_CLASS(parent_class)->finalize (obj); } - + GtkWidget* -modest_header_view_new (TnyMsgFolderIface *folder, - GSList *columns, - ModestHeaderViewStyle style) +modest_header_view_new (TnyFolder *folder, const GList *columns, + ModestHeaderViewStyle style) { GObject *obj; GtkTreeSelection *sel; ModestHeaderView *self; + ModestHeaderViewPrivate *priv; obj = G_OBJECT(g_object_new(MODEST_TYPE_HEADER_VIEW, NULL)); self = MODEST_HEADER_VIEW(obj); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); if (!modest_header_view_set_folder (self, NULL)) { g_warning ("could not set the folder"); @@ -514,53 +509,68 @@ modest_header_view_new (TnyMsgFolderIface *folder, /* all cols */ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(obj), TRUE); gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), TRUE); + gtk_tree_view_columns_autosize (GTK_TREE_VIEW(obj)); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(obj), TRUE); /* alternating row colors */ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); - g_signal_connect (sel, "changed", - G_CALLBACK(on_selection_changed), self); - + + priv->sig1 = g_signal_connect (sel, "changed", + G_CALLBACK(on_selection_changed), self); return GTK_WIDGET(self); } -gboolean -modest_header_view_set_columns (ModestHeaderView *self, GSList *columns) + +TnyList * +modest_header_view_get_selected_headers (ModestHeaderView *self) { + GtkTreeSelection *sel; ModestHeaderViewPrivate *priv; - GSList *cursor; - - g_return_val_if_fail (self, FALSE); + TnyList *header_list = NULL; + TnyHeader *header; + GList *list, *tmp = NULL; + GtkTreeModel *tree_model = NULL; + GtkTreeIter iter; priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - g_slist_free (priv->columns); - - for (cursor = columns; cursor; cursor = cursor->next) { - ModestHeaderViewColumn col = - (ModestHeaderViewColumn) GPOINTER_TO_INT(cursor->data); - if (0 > col || col >= MODEST_HEADER_VIEW_COLUMN_NUM) - g_warning ("invalid column in column list"); - else - priv->columns = g_slist_append (priv->columns, cursor->data); + /* Get selected rows */ + sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); + list = gtk_tree_selection_get_selected_rows (sel, &tree_model); + + if (list) { + header_list = tny_simple_list_new(); + + list = g_list_reverse (list); + tmp = list; + while (tmp) { + /* get header from selection */ + gtk_tree_model_get_iter (tree_model, + &iter, + (GtkTreePath *) (tmp->data)); + + gtk_tree_model_get (tree_model, &iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + &header, -1); + + /* Prepend to list */ + tny_list_prepend (header_list, G_OBJECT (header)); + tmp = g_list_next (tmp); + } + /* Clean up*/ + g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL); + g_list_free (list); } - - init_columns (self); /* redraw them */ - return TRUE; + return header_list; } - -const GSList* +GList* modest_header_view_get_columns (ModestHeaderView *self) { - ModestHeaderViewPrivate *priv; - - g_return_val_if_fail (self, FALSE); - - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - return priv->columns; + g_return_val_if_fail (self, FALSE); + return gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); } @@ -568,11 +578,10 @@ modest_header_view_get_columns (ModestHeaderView *self) gboolean modest_header_view_set_style (ModestHeaderView *self, - ModestHeaderViewStyle style) + ModestHeaderViewStyle style) { g_return_val_if_fail (self, FALSE); - g_return_val_if_fail (style >= 0 && style < MODEST_HEADER_VIEW_STYLE_NUM, - FALSE); + g_return_val_if_fail (style < MODEST_HEADER_VIEW_STYLE_NUM, FALSE); MODEST_HEADER_VIEW_GET_PRIVATE(self)->style = style; @@ -593,11 +602,15 @@ modest_header_view_get_style (ModestHeaderView *self) static inline int get_prefix_len (const gchar *sub) { - gint i = 0; - const static gchar* prefix[] = {"Re:", "RE:", "Fwd:", "FWD:", "FW:", "AW:", NULL}; - - if (sub[0] != 'R' && sub[0] != 'F') /* optimization */ + gint i; + static const gchar* prefix[] = { + "Re:", "RE:", "Fwd:", "FWD:", "FW:", NULL + }; + + if (!sub || (sub[0] != 'R' && sub[0] != 'F')) /* optimization */ return 0; + + i = 0; while (prefix[i]) { if (g_str_has_prefix(sub, prefix[i])) { @@ -612,16 +625,27 @@ get_prefix_len (const gchar *sub) } -static inline gint -cmp_normalized_subject (const gchar* s1, const gchar *s2) + +/* a strcmp that is case insensitive and NULL-safe */ +static gint +cmp_insensitive_str (const gchar* s1, const gchar *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); + gchar *n1, *n2; + + /* work even when s1 and/or s2 == NULL */ + if (s1 == s2) + return 0; + if (!s1) + return -1; + if (!s2) + return 1; + + n1 = g_utf8_collate_key (s1, -1); + n2 = g_utf8_collate_key (s2, -1); result = strcmp (n1, n2); + g_free (n1); g_free (n2); @@ -633,13 +657,22 @@ static gint cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer user_data) { - gint col_id = GPOINTER_TO_INT (user_data); + gint col_id; gint t1, t2; gint val1, val2; gchar *s1, *s2; gint cmp; - g_return_val_if_fail (GTK_IS_TREE_MODEL(tree_model), -1); + static int counter = 0; + col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_COLUMN)); + + 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) { @@ -647,19 +680,19 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER: case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE: gtk_tree_model_get (tree_model, iter1, - TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, + TNY_GTK_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, + TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, &t2,-1); return t1 - t2; case MODEST_HEADER_VIEW_COLUMN_SENT_DATE: gtk_tree_model_get (tree_model, iter1, - TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, + TNY_GTK_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, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,-1); return t1 - t2; @@ -668,15 +701,16 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, case MODEST_HEADER_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, + 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_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s2, - TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, + TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s2, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1); - - cmp = cmp_normalized_subject(s1, s2); + + /* the prefix ('Re:', 'Fwd:' etc.) we ignore */ + cmp = cmp_insensitive_str (s1 + get_prefix_len(s1), s2 + get_prefix_len(s2)); g_free (s1); g_free (s2); @@ -687,14 +721,14 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, case MODEST_HEADER_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, + 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_MSG_HEADER_LIST_MODEL_FROM_COLUMN, &s2, - TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, + TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &s2, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1); - cmp = strcmp (s1, s2); + cmp = cmp_insensitive_str (s1, s2); g_free (s1); g_free (s2); @@ -703,14 +737,14 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, case MODEST_HEADER_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, + 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_MSG_HEADER_LIST_MODEL_TO_COLUMN, &s2, - TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, + TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &s2, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1); - cmp = strcmp (s1, s2); + cmp = cmp_insensitive_str (s1, s2); g_free (s1); g_free (s2); @@ -718,22 +752,22 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, case MODEST_HEADER_VIEW_COLUMN_ATTACH: - 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); + 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_MSG_HEADER_FLAG_ATTACHMENTS) - - (val2 & TNY_MSG_HEADER_FLAG_ATTACHMENTS); + cmp = (val1 & TNY_HEADER_FLAG_ATTACHMENTS) - + (val2 & TNY_HEADER_FLAG_ATTACHMENTS); return cmp ? cmp : t1 - t2; case MODEST_HEADER_VIEW_COLUMN_MSGTYPE: - 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); + 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; @@ -744,205 +778,164 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, static void -refresh_folder (TnyMsgFolderIface *folder, gboolean cancelled, - gpointer user_data) +on_refresh_folder (TnyFolder *folder, gboolean cancelled, GError **err, + gpointer user_data) { - GtkTreeModel *oldsortable, *sortable; - ModestHeaderView *self = - MODEST_HEADER_VIEW(user_data); + GtkTreeModel *sortable; + ModestHeaderView *self; ModestHeaderViewPrivate *priv; - g_return_if_fail (self); - if (cancelled) return; + self = MODEST_HEADER_VIEW(user_data); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + g_assert (folder == priv->folder); + if (!folder) /* when there is no folder */ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE); - else { /* it's a new one or a refresh */ - GSList *col; + GList *cols, *cursor; + + if (priv->headers) + g_object_unref (priv->headers); - priv->headers = TNY_LIST_IFACE(tny_msg_header_list_model_new ()); - - 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); /* async */ + priv->headers = TNY_LIST(tny_gtk_header_list_model_new ()); + tny_folder_get_headers (folder, priv->headers, FALSE, NULL); /* FIXME */ - oldsortable = gtk_tree_view_get_model(GTK_TREE_VIEW (self)); - if (oldsortable && GTK_IS_TREE_MODEL_SORT(oldsortable)) { - GtkTreeModel *oldmodel = gtk_tree_model_sort_get_model - (GTK_TREE_MODEL_SORT(oldsortable)); - if (oldmodel) - g_object_unref (G_OBJECT(oldmodel)); - g_object_unref (oldsortable); - } - - sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(priv->headers)); + tny_gtk_header_list_model_set_folder + (TNY_GTK_HEADER_LIST_MODEL(priv->headers),folder, TRUE); /*async*/ + + sortable = gtk_tree_model_sort_new_with_model + (GTK_TREE_MODEL(priv->headers)); /* 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, + 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, - GINT_TO_POINTER(col_id), NULL); - col = col->next; + cursor->data, NULL); + cursor = g_list_next(cursor); } + g_list_free (cols); 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 */ + gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self),TRUE); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE); + /* no need to unref sortable */ } - } static void -refresh_folder_status_update (TnyMsgFolderIface *folder, const gchar *msg, - gint status_id, gpointer user_data) +on_refresh_folder_status_update (TnyFolder *folder, const gchar *msg, + gint num, gint total, gpointer user_data) { ModestHeaderView *self; ModestHeaderViewPrivate *priv; - - self = MODEST_HEADER_VIEW (user_data); + + self = MODEST_HEADER_VIEW(user_data); priv = MODEST_HEADER_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; + g_signal_emit (G_OBJECT(self), signals[STATUS_UPDATE_SIGNAL], + 0, msg, num, total); } -static gboolean -refresh_folder_finish_status_update (gpointer user_data) +TnyFolder* +modest_header_view_get_folder (ModestHeaderView *self) { - ModestHeaderView *self; ModestHeaderViewPrivate *priv; - - self = MODEST_HEADER_VIEW (user_data); priv = MODEST_HEADER_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; + return priv->folder; } gboolean -modest_header_view_set_folder (ModestHeaderView *self, - TnyMsgFolderIface *folder) +modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) { ModestHeaderViewPrivate *priv; - - g_return_val_if_fail (MODEST_IS_HEADER_VIEW (self), FALSE); - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - g_mutex_lock (priv->lock); - + priv->folder = folder; + 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_folder_refresh_async (folder, + on_refresh_folder, + on_refresh_folder_status_update, + self); } - else { /* it's a new one or a refresh */ - tny_msg_folder_iface_refresh_async (folder, - refresh_folder, - refresh_folder_status_update, - self); - } - + /* no message selected */ g_signal_emit (G_OBJECT(self), signals[MESSAGE_SELECTED_SIGNAL], 0, NULL); - - g_mutex_unlock (priv->lock); - return TRUE; } + static void on_selection_changed (GtkTreeSelection *sel, gpointer user_data) { - GtkTreeModel *model; - TnyMsgHeaderIface *header; - GtkTreeIter iter; + GtkTreeModel *model; + TnyHeader *header; + TnyHeaderFlags header_flags; + GtkTreeIter iter; ModestHeaderView *self; ModestHeaderViewPrivate *priv; + const TnyMsg *msg = NULL; + const TnyFolder *folder; g_return_if_fail (sel); g_return_if_fail (user_data); self = MODEST_HEADER_VIEW (user_data); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - - + if (!gtk_tree_selection_get_selected (sel, &model, &iter)) return; /* msg was _un_selected */ - - //g_mutex_lock (priv->lock); gtk_tree_model_get (model, &iter, - TNY_MSG_HEADER_LIST_MODEL_INSTANCE_COLUMN, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); - if (header) { - const TnyMsgIface *msg = NULL; - const TnyMsgFolderIface *folder; - - folder = tny_msg_header_iface_get_folder (TNY_MSG_HEADER_IFACE(header)); - if (!folder) - g_printerr ("modest: cannot find folder\n"); - else { - msg = tny_msg_folder_iface_get_message (TNY_MSG_FOLDER_IFACE(folder), - header); - if (!msg) { - g_printerr ("modest: cannot find msg\n"); - gtk_tree_store_remove (GTK_TREE_STORE(model), - &iter); - } - } - - g_signal_emit (G_OBJECT(self), signals[MESSAGE_SELECTED_SIGNAL], 0, - 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, TNY_MSG_HEADER_FLAG_SEEN); + if (!header) { + g_printerr ("modest: cannot find header\n"); + return; } - // g_mutex_unlock (priv->lock); + folder = tny_header_get_folder (TNY_HEADER(header)); + if (!folder) { + g_signal_emit (G_OBJECT(self), signals[ITEM_NOT_FOUND_SIGNAL], 0, + MODEST_ITEM_TYPE_FOLDER); + return; + } -} - - -/* static void */ -/* on_column_clicked (GtkTreeViewColumn *col, gpointer user_data) */ -/* { */ -/* GtkTreeView *treeview; */ -/* gint id; */ - -/* treeview = GTK_TREE_VIEW (user_data); */ -/* id = gtk_tree_view_column_get_sort_column_id (col); */ + msg = tny_folder_get_msg (TNY_FOLDER(folder), + header, NULL); /* FIXME */ + if (!msg) { + g_signal_emit (G_OBJECT(self), signals[ITEM_NOT_FOUND_SIGNAL], 0, + MODEST_ITEM_TYPE_MESSAGE); + return; + } + + g_signal_emit (G_OBJECT(self), signals[MESSAGE_SELECTED_SIGNAL], 0, + msg); -/* gtk_tree_view_set_search_column (treeview, id); */ -/* } */ + /* mark message as seen; _set_flags crashes, bug in tinymail? */ + header_flags = tny_header_get_flags (TNY_HEADER(header)); + tny_header_set_flags (header, header_flags | TNY_HEADER_FLAG_SEEN); + + /* Free */ +/* g_free (folder); */ +}