-/* modest-tny-header-tree-view.c
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+
+/* modest-tny-header-tree-view.c */
+
#include <glib/gi18n.h>
#include "modest-tny-header-tree-view.h"
#include <tny-list-iface.h>
#include <string.h>
+#include "modest-marshal.h"
+
+#include <modest-icon-names.h>
+#include "modest-icon-factory.h"
-/* 'private'/'protected' functions */
static void modest_tny_header_tree_view_class_init (ModestTnyHeaderTreeViewClass *klass);
static void modest_tny_header_tree_view_init (ModestTnyHeaderTreeView *obj);
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 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);
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];
+ gint status_id;
+ GSList *columns;
- GSList *columns;
+ GMutex *lock;
+
ModestTnyHeaderTreeViewStyle style;
};
#define MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
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),
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);
}
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;
+ 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_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);
+
+ 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;
-
+ pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_ATTACH);
+
g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
}
-
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);
+
+ 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);
+}
+
+
+
+/* try to make a shorter display address; changes it arg in-place */
+static gchar*
+display_address (gchar *address)
+{
+ gchar *cursor;
+
+ if (!address)
+ return;
- 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 */
+ /* simplistic --> remove <email@address> 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_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;
-
+ 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, &address,
TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
- TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, &flags
-1);
- rendobj = G_OBJECT(renderer);
- /* simplistic --> remove <email@address> 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 */
+ g_object_set (G_OBJECT(renderer),
+ "text",
+ display_address (address),
+ "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 (address);
}
+/* 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 *address;
+ 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_COLUMN, &date,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, &date,
-1);
rendobj = G_OBJECT(renderer);
-
- /* simplistic --> remove <email@address> from display */
- address = g_strstr_len (from, strlen(from), "<");
- 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",
+ 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) ?
+ 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,
static void
init_columns (ModestTnyHeaderTreeView *obj)
{
- GtkTreeViewColumn *column;
+ GtkTreeViewColumn *column=NULL;
GtkCellRenderer *renderer_msgtype,
*renderer_header,
*renderer_attach;
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);
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;
+ priv->lock = g_mutex_new ();
}
static void
{
ModestTnyHeaderTreeView *self;
ModestTnyHeaderTreeViewPrivate *priv;
- int i;
self = MODEST_TNY_HEADER_TREE_VIEW(obj);
priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self);
if (priv->headers)
g_object_unref (G_OBJECT(priv->headers));
+
+ if (priv->lock) {
+ g_mutex_free (priv->lock);
+ priv->lock = NULL;
+ }
+
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;
- }
- }
+ G_OBJECT_CLASS(parent_class)->finalize (obj);
}
GtkWidget*
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
g_signal_connect (sel, "changed",
- G_CALLBACK(selection_changed), self);
-
+ G_CALLBACK(on_selection_changed), self);
+
return GTK_WIDGET(self);
}
modest_tny_header_tree_view_get_columns (ModestTnyHeaderTreeView *self)
{
ModestTnyHeaderTreeViewPrivate *priv;
- GSList *cursor;
g_return_val_if_fail (self, FALSE);
/* 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;
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;
}
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)) {
}
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 */
+ }
+
+}
+
+
+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;
- } else /* when there is no folder */
- gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self), FALSE);
-
+ g_return_val_if_fail (MODEST_IS_TNY_HEADER_TREE_VIEW (self), FALSE);
+
+ priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self);
+
+ g_mutex_lock (priv->lock);
+
+ 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);
+ }
+
+ /* no message selected */
+ g_signal_emit (G_OBJECT(self), signals[MESSAGE_SELECTED_SIGNAL], 0,
+ NULL);
+
+ g_mutex_unlock (priv->lock);
+
return TRUE;
}
+
static void
-selection_changed (GtkTreeSelection *sel, gpointer user_data)
+on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
{
- GtkTreeModel *model;
- TnyMsgHeaderIface *header;
- GtkTreeIter iter;
- ModestTnyHeaderTreeView *tree_view;
-
+ GtkTreeModel *model;
+ TnyMsgHeaderIface *header;
+ GtkTreeIter iter;
+ ModestTnyHeaderTreeView *self;
+ ModestTnyHeaderTreeViewPrivate *priv;
+
g_return_if_fail (sel);
g_return_if_fail (user_data);
+ self = MODEST_TNY_HEADER_TREE_VIEW (user_data);
+ priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self);
+
+
if (!gtk_tree_selection_get_selected (sel, &model, &iter))
return; /* msg was _un_selected */
-
- tree_view = MODEST_TNY_HEADER_TREE_VIEW (user_data);
+
+ //g_mutex_lock (priv->lock);
gtk_tree_model_get (model, &iter,
TNY_MSG_HEADER_LIST_MODEL_INSTANCE_COLUMN,
&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));
if (!folder)
- g_message ("cannot find 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_message ("cannot find msg");
- /* FIXME: update display */
+ g_printerr ("modest: cannot find msg\n");
+ gtk_tree_store_remove (GTK_TREE_STORE(model),
+ &iter);
}
}
- g_signal_emit (G_OBJECT(tree_view), signals[MESSAGE_SELECTED_SIGNAL], 0,
+ 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, 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);
}
+
+ // g_mutex_unlock (priv->lock);
+
}
static void
-column_clicked (GtkTreeViewColumn *col, gpointer user_data)
+on_column_clicked (GtkTreeViewColumn *col, gpointer user_data)
{
GtkTreeView *treeview;
gint id;
projects / modest / blobdiff