* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-/* modest-tny-header-tree-view.c */
-
#include <glib/gi18n.h>
#include "modest-header-view.h"
#include <tny-list-iface.h>
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);
enum {
MESSAGE_SELECTED_SIGNAL,
+ ITEM_NOT_FOUND_SIGNAL,
STATUS_UPDATE_SIGNAL,
LAST_SIGNAL
};
+
typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
struct _ModestHeaderViewPrivate {
- TnyMsgFolderIface *tny_msg_folder;
+ TnyFolderIface *tny_folder;
TnyListIface *headers;
-
- gint status_id;
GSList *columns;
-
GMutex *lock;
-
ModestHeaderViewStyle style;
+
+ gulong sig1;
+
};
#define MODEST_HEADER_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_HEADER_VIEW, \
sizeof(ModestHeaderView),
1, /* n_preallocs */
(GInstanceInitFunc) modest_header_view_init,
+ NULL
};
my_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
"ModestHeaderView",
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_TYPE_NONE, 2, G_TYPE_STRING, 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_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);
}
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_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);
}
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_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);
}
cursor = g_strstr_len (address, strlen(address), "(");
if (cursor)
cursor[0]='\0';
+
+ /* FIXME */
+ if (!g_utf8_validate (address, -1, NULL))
+ g_printerr ("modest: invalid: '%s'", address);
return address;
}
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_HEADER_LIST_MODEL_FROM_COLUMN;
else
- sender_receiver_col = TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN;
+ sender_receiver_col = TNY_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_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
-1);
-
+
g_object_set (G_OBJECT(renderer),
"text",
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);
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_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+ TNY_HEADER_LIST_MODEL_FROM_COLUMN, &from,
+ TNY_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
+ TNY_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, &date,
-1);
rendobj = G_OBJECT(renderer);
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);
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;
}
case MODEST_HEADER_VIEW_COLUMN_MSGTYPE:
column = get_new_column (_("M"), renderer_msgtype, FALSE,
- TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
+ TNY_HEADER_LIST_MODEL_FLAGS_COLUMN,
FALSE, (GtkTreeCellDataFunc)msgtype_cell_data,
NULL);
break;
case MODEST_HEADER_VIEW_COLUMN_ATTACH:
column = get_new_column (_("A"), renderer_attach, FALSE,
- TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
+ TNY_HEADER_LIST_MODEL_FLAGS_COLUMN,
FALSE, (GtkTreeCellDataFunc)attach_cell_data,
NULL);
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_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_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_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_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_HEADER_LIST_MODEL_SUBJECT_COLUMN,
TRUE, (GtkTreeCellDataFunc)header_cell_data,
NULL);
break;
case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
column = get_new_column (_("Sent"), renderer_header, TRUE,
- TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_COLUMN,
+ TNY_HEADER_LIST_MODEL_DATE_SENT_COLUMN,
TRUE, (GtkTreeCellDataFunc)header_cell_data,
NULL);
break;
+
+ default:
+ g_assert_not_reached ();
}
+
+ gtk_tree_view_column_set_visible (column, TRUE);
+ gtk_tree_view_column_set_min_width (column, 36);
+ gtk_tree_view_column_set_resizable (column, TRUE);
+
gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
}
}
ModestHeaderViewPrivate *priv;
priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj);
- priv->status_id = 0;
priv->lock = g_mutex_new ();
+ priv->sig1 = 0;
}
static void
{
ModestHeaderView *self;
ModestHeaderViewPrivate *priv;
+ GtkTreeSelection *sel;
self = MODEST_HEADER_VIEW(obj);
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
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->tny_folder = NULL;
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
GtkWidget*
-modest_header_view_new (TnyMsgFolderIface *folder,
- GSList *columns,
- ModestHeaderViewStyle style)
+modest_header_view_new (TnyFolderIface *folder,
+ GSList *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");
/* 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);
}
ModestHeaderViewColumn col =
(ModestHeaderViewColumn) GPOINTER_TO_INT(cursor->data);
if (0 > col || col >= MODEST_HEADER_VIEW_COLUMN_NUM)
- g_warning ("invalid column in column list");
+ g_printerr ("modest: invalid column %d in column list\n", col);
else
priv->columns = g_slist_append (priv->columns, cursor->data);
}
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_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_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_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_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
&t2,-1);
return t1 - t2;
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_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s1,
+ TNY_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_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s2,
+ TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-1);
cmp = cmp_normalized_subject(s1, s2);
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_HEADER_LIST_MODEL_FROM_COLUMN, &s1,
+ TNY_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_HEADER_LIST_MODEL_FROM_COLUMN, &s2,
+ TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-1);
cmp = strcmp (s1, s2);
g_free (s1);
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_HEADER_LIST_MODEL_TO_COLUMN, &s1,
+ TNY_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_HEADER_LIST_MODEL_TO_COLUMN, &s2,
+ TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-1);
cmp = strcmp (s1, s2);
g_free (s1);
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_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
+ TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, -1);
+ gtk_tree_model_get (tree_model, iter2, TNY_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
+ TNY_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_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
+ TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,-1);
+ gtk_tree_model_get (tree_model, iter2, TNY_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
+ TNY_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;
static void
-refresh_folder (TnyMsgFolderIface *folder, gboolean cancelled,
- gpointer user_data)
+on_refresh_folder (TnyFolderIface *folder, gboolean cancelled, gpointer user_data)
{
GtkTreeModel *oldsortable, *sortable;
- ModestHeaderView *self =
- MODEST_HEADER_VIEW(user_data);
+ 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_mutex_lock (priv->lock);
+
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;
- priv->headers = TNY_LIST_IFACE(tny_msg_header_list_model_new ());
+ priv->headers = TNY_LIST_IFACE(tny_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),
+ tny_folder_iface_get_headers (folder, priv->headers, FALSE);
+ tny_header_list_model_set_folder (TNY_HEADER_LIST_MODEL(priv->headers),
folder, TRUE); /* async */
oldsortable = gtk_tree_view_get_model(GTK_TREE_VIEW (self));
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);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE);
/* no need to unref sortable */
}
-
+ g_mutex_unlock (priv->lock);
}
static void
-refresh_folder_status_update (TnyMsgFolderIface *folder, const gchar *msg,
- gint status_id, gpointer user_data)
+on_refresh_folder_status_update (TnyFolderIface *folder, const gchar *msg,
+ gint status_id, gpointer user_data)
{
ModestHeaderView *self;
ModestHeaderViewPrivate *priv;
-
- 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;
-}
-
-
-static gboolean
-refresh_folder_finish_status_update (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);
- if (priv->status_id == 0)
- return FALSE;
-
- refresh_folder_status_update (NULL, NULL, priv->status_id,
- user_data);
- priv->status_id = 0;
-
- return FALSE;
+ g_signal_emit (G_OBJECT(self), signals[STATUS_UPDATE_SIGNAL],
+ 0, msg, status_id);
}
+
gboolean
modest_header_view_set_folder (ModestHeaderView *self,
- TnyMsgFolderIface *folder)
+ TnyFolderIface *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);
if (!folder) {/* when there is no folder */
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,
+ } else { /* it's a new one or a refresh */
+ tny_folder_iface_refresh_async (folder,
+ on_refresh_folder,
+ on_refresh_folder_status_update,
self);
}
static void
on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
{
- GtkTreeModel *model;
- TnyMsgHeaderIface *header;
- GtkTreeIter iter;
+ GtkTreeModel *model;
+ TnyHeaderIface *header;
+ GtkTreeIter iter;
ModestHeaderView *self;
ModestHeaderViewPrivate *priv;
+ const TnyMsgIface *msg = NULL;
+ const TnyFolderIface *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_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_iface_get_folder (TNY_HEADER_IFACE(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_iface_get_message (TNY_FOLDER_IFACE(folder),
+ header);
+ 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? */
+ //flags = tny_header_iface_get_flags (TNY_HEADER_IFACE(header));
+ //tny_header_iface_set_flags (header, TNY_HEADER_FLAG_SEEN);
+}
+
projects / modest / blobdiff