X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=1f84bb26e01d155d9a6bcac3eca69e8ffae306af;hp=1898172f5274ba77c376dbe87f7e5bd6ccf447e6;hb=fd958e8a96328612ae617b3f04627781d6dc7b1f;hpb=2657b59fbb82d49daa8fb1576ea3052fcee8aa41 diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 1898172..1f84bb2 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -36,11 +36,13 @@ #include #include #include +#include #include #include #include #include +#include "modest-platform.h" static void modest_header_view_class_init (ModestHeaderViewClass *klass); static void modest_header_view_init (ModestHeaderView *obj); @@ -66,13 +68,23 @@ static gboolean on_focus_in (GtkWidget *sef, GdkEventFocus *event, gpointer user_data); +static void folder_monitor_update (TnyFolderObserver *self, + TnyFolderChange *change); + +static void tny_folder_observer_init (TnyFolderObserverIface *klass); + typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate; struct _ModestHeaderViewPrivate { TnyFolder *folder; ModestHeaderViewStyle style; TnyFolderMonitor *monitor; - GMutex *monitor_lock; + GMutex *observers_lock; + + gint sort_colid[2][TNY_FOLDER_TYPE_NUM]; + gint sort_type[2][TNY_FOLDER_TYPE_NUM]; + + }; #define MODEST_HEADER_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -114,9 +126,21 @@ modest_header_view_get_type (void) (GInstanceInitFunc) modest_header_view_init, NULL }; + + static const GInterfaceInfo tny_folder_observer_info = + { + (GInterfaceInitFunc) tny_folder_observer_init, /* interface_init */ + NULL, /* interface_finalize */ + NULL /* interface_data */ + }; my_type = g_type_register_static (GTK_TYPE_TREE_VIEW, "ModestHeaderView", &my_info, 0); + + g_type_add_interface_static (my_type, TNY_TYPE_FOLDER_OBSERVER, + &tny_folder_observer_info); + + } return my_type; } @@ -170,6 +194,12 @@ modest_header_view_class_init (ModestHeaderViewClass *klass) G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT); } +static void +tny_folder_observer_init (TnyFolderObserverIface *klass) +{ + klass->update_func = folder_monitor_update; +} + static GtkTreeViewColumn* get_new_column (const gchar *name, GtkCellRenderer *renderer, gboolean resizable, gint sort_col_id, gboolean show_as_text, @@ -206,7 +236,7 @@ static void remove_all_columns (ModestHeaderView *obj) { GList *columns, *cursor; - + columns = gtk_tree_view_get_columns (GTK_TREE_VIEW(obj)); for (cursor = columns; cursor; cursor = cursor->next) @@ -216,7 +246,7 @@ remove_all_columns (ModestHeaderView *obj) } gboolean -modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) +modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, TnyFolderType type) { GtkTreeModel *sortable; GtkTreeViewColumn *column=NULL; @@ -236,6 +266,9 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) renderer_comptact_flag = gtk_cell_renderer_pixbuf_new (); renderer_compact_date = gtk_cell_renderer_text_new (); + g_object_set(G_OBJECT(renderer_header), + "ellipsize", PANGO_ELLIPSIZE_END, + NULL); g_object_set(G_OBJECT(renderer_compact_date), "xalign", 1.0, NULL); @@ -328,21 +361,38 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) break; case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE: - column = get_new_column (_("Received"), renderer_compact_date, TRUE, + column = get_new_column (_("Received"), renderer_header, TRUE, TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, TRUE, (GtkTreeCellDataFunc)_modest_header_view_date_cell_data, GINT_TO_POINTER(TRUE)); break; - case MODEST_HEADER_VIEW_COLUMN_SENT_DATE: - column = get_new_column (_("Sent"), renderer_compact_date, TRUE, + case MODEST_HEADER_VIEW_COLUMN_SENT_DATE: + column = get_new_column (_("Sent"), renderer_header, TRUE, TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, TRUE, (GtkTreeCellDataFunc)_modest_header_view_date_cell_data, GINT_TO_POINTER(FALSE)); break; + case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE: + column = get_new_column (_("Received"), renderer_compact_date, FALSE, + TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, + TRUE, + (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data, + GINT_TO_POINTER(TRUE)); + gtk_tree_view_column_set_fixed_width (column, 130); + break; + + case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE: + column = get_new_column (_("Sent"), renderer_compact_date, FALSE, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, + TRUE, + (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data, + GINT_TO_POINTER(FALSE)); + gtk_tree_view_column_set_fixed_width (column, 130); + break; case MODEST_HEADER_VIEW_COLUMN_SIZE: column = get_new_column (_("Size"), renderer_header, TRUE, TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, @@ -362,11 +412,13 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) g_return_val_if_reached(FALSE); } - if (sortable) + if (sortable) { gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), - col, (GtkTreeIterCompareFunc)cmp_rows, + col, + (GtkTreeIterCompareFunc) cmp_rows, column, NULL); - + } + /* we keep the column id around */ g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_COLUMN, GINT_TO_POINTER(col)); @@ -375,7 +427,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_PTR, self); gtk_tree_view_append_column (GTK_TREE_VIEW(self), column); - } + } return TRUE; } @@ -384,14 +436,22 @@ static void modest_header_view_init (ModestHeaderView *obj) { ModestHeaderViewPrivate *priv; + guint i, j; priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); priv->folder = NULL; priv->monitor = NULL; - priv->monitor_lock = g_mutex_new (); - + priv->observers_lock = g_mutex_new (); + + /* Sort parameters */ + for (j=0; j < 2; j++) { + for (i=0; i < TNY_FOLDER_TYPE_NUM; i++) { + priv->sort_colid[j][i] = -1; + priv->sort_type[j][i] = GTK_SORT_DESCENDING; + } + } setup_drag_and_drop (GTK_TREE_VIEW (obj)); } @@ -405,19 +465,20 @@ modest_header_view_finalize (GObject *obj) self = MODEST_HEADER_VIEW(obj); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - g_mutex_lock (priv->monitor_lock); + g_mutex_lock (priv->observers_lock); if (priv->monitor) { tny_folder_monitor_stop (priv->monitor); g_object_unref (G_OBJECT (priv->monitor)); } - g_mutex_unlock (priv->monitor_lock); - g_mutex_free (priv->monitor_lock); + g_mutex_unlock (priv->observers_lock); + g_mutex_free (priv->observers_lock); if (priv->folder) { + tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj)); g_object_unref (G_OBJECT (priv->folder)); priv->folder = NULL; } - + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -596,6 +657,7 @@ modest_header_view_get_columns (ModestHeaderView *self) return gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); } + gboolean modest_header_view_is_empty (ModestHeaderView *self) { @@ -665,65 +727,12 @@ modest_header_view_set_model (GtkTreeView *header_view, GtkTreeModel *model) /* Set new model */ gtk_tree_view_set_model (header_view, model); - - modest_runtime_verify_object_death (old_model, ""); - modest_runtime_verify_object_death (old_model_sort, ""); } else gtk_tree_view_set_model (header_view, model); return; } -static void -on_progress_changed (ModestMailOperation *mail_op, - ModestHeaderView *self) -{ - GtkTreeModel *sortable; - ModestHeaderViewPrivate *priv; - GList *cols, *cursor; - TnyList *headers; - - if (!modest_mail_operation_is_finished (mail_op)) - return; - - if (modest_mail_operation_get_error (mail_op)) - return; - - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - - headers = TNY_LIST (tny_gtk_header_list_model_new ()); - - tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers), - priv->folder, TRUE); - - sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers)); - g_object_unref (G_OBJECT (headers)); - - /* install our special sorting functions */ - cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); - while (cursor) { - gint col_id = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cursor->data), - MODEST_HEADER_VIEW_COLUMN)); - gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), - col_id, - (GtkTreeIterCompareFunc) cmp_rows, - cursor->data, NULL); - cursor = g_list_next(cursor); - } - g_list_free (cols); - - /* Set new model */ - modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); - g_object_unref (G_OBJECT (sortable)); - - /* Add a folder observer */ - g_mutex_lock (priv->monitor_lock); - priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (priv->folder)); - tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers)); - tny_folder_monitor_start (priv->monitor); - g_mutex_unlock (priv->monitor_lock); -} - TnyFolder* modest_header_view_get_folder (ModestHeaderView *self) { @@ -739,10 +748,13 @@ modest_header_view_get_folder (ModestHeaderView *self) static void modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) { + TnyFolderType type; TnyList *headers; ModestHeaderViewPrivate *priv; GList *cols, *cursor; GtkTreeModel *sortable; + guint sort_colid; + GtkSortType sort_type; priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -751,8 +763,9 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers), folder, FALSE); - /* Add a folder observer */ - g_mutex_lock (priv->monitor_lock); + /* Add IDLE observer (monitor) and another folder observer for + new messages (self) */ + g_mutex_lock (priv->observers_lock); if (priv->monitor) { tny_folder_monitor_stop (priv->monitor); g_object_unref (G_OBJECT (priv->monitor)); @@ -760,8 +773,8 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (folder)); tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers)); tny_folder_monitor_start (priv->monitor); - g_mutex_unlock (priv->monitor_lock); - + tny_folder_add_observer (folder, TNY_FOLDER_OBSERVER (self)); + g_mutex_unlock (priv->observers_lock); sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers)); g_object_unref (G_OBJECT (headers)); @@ -777,12 +790,92 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) cursor->data, NULL); cursor = g_list_next(cursor); } - g_list_free (cols); + /* Restore sort column id */ + if (cols) { + type = modest_tny_folder_guess_folder_type (folder); + sort_colid = modest_header_view_get_sort_column_id (self, type); + sort_type = modest_header_view_get_sort_type (self, type); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), + sort_colid, + sort_type); + } /* Set new model */ modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); g_object_unref (G_OBJECT (sortable)); + + /* Free */ + g_list_free (cols); +} + +void +modest_header_view_sort_by_column_id (ModestHeaderView *self, + guint sort_colid, + GtkSortType sort_type) +{ + ModestHeaderViewPrivate *priv = NULL; + GtkTreeModel *sortable = NULL; + TnyFolderType type; + + /* Get model and private data */ + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + + /* Sort tree model */ + type = modest_tny_folder_guess_folder_type (priv->folder); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), + sort_colid, + sort_type); + /* Store new sort parameters */ + modest_header_view_set_sort_params (self, sort_colid, sort_type, type); + + /* Save GConf parameters */ +/* modest_widget_memory_save (modest_runtime_get_conf(), */ +/* G_OBJECT(self), "header-view"); */ + +} + +void +modest_header_view_set_sort_params (ModestHeaderView *self, + guint sort_colid, + GtkSortType sort_type, + TnyFolderType type) +{ + ModestHeaderViewPrivate *priv; + ModestHeaderViewStyle style; + + style = modest_header_view_get_style (self); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + priv->sort_colid[style][type] = sort_colid; + priv->sort_type[style][type] = sort_type; +} + +gint +modest_header_view_get_sort_column_id (ModestHeaderView *self, + TnyFolderType type) +{ + ModestHeaderViewPrivate *priv; + ModestHeaderViewStyle style; + + style = modest_header_view_get_style (self); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + return priv->sort_colid[style][type]; +} + +GtkSortType +modest_header_view_get_sort_type (ModestHeaderView *self, + TnyFolderType type) +{ + ModestHeaderViewPrivate *priv; + ModestHeaderViewStyle style; + + style = modest_header_view_get_style (self); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + return priv->sort_type[style][type]; } void @@ -793,13 +886,17 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); if (priv->folder) { + g_mutex_lock (priv->observers_lock); + tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (self)); g_object_unref (priv->folder); priv->folder = NULL; + g_mutex_unlock (priv->observers_lock); } if (folder) { ModestMailOperation *mail_op; + /* Set folder in the model */ modest_header_view_set_folder_intern (self, folder); /* Pick my reference. Nothing to do with the mail operation */ @@ -809,14 +906,10 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL); /* Create the mail operation */ - mail_op = modest_mail_operation_new (); + mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - /* Register a mail operation observer */ - g_signal_connect (mail_op, "progress-changed", - G_CALLBACK (on_progress_changed), self); - /* Refresh the folder asynchronously */ modest_mail_operation_refresh_folder (mail_op, folder); @@ -824,15 +917,16 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) g_object_unref (mail_op); } else { - g_mutex_lock (priv->monitor_lock); - modest_header_view_set_model (GTK_TREE_VIEW (self), NULL); + g_mutex_lock (priv->observers_lock); if (priv->monitor) { tny_folder_monitor_stop (priv->monitor); g_object_unref (G_OBJECT (priv->monitor)); priv->monitor = NULL; } - g_mutex_unlock (priv->monitor_lock); + modest_header_view_set_model (GTK_TREE_VIEW (self), NULL); + + g_mutex_unlock (priv->observers_lock); } } @@ -930,9 +1024,11 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gint t1, t2; gint val1, val2; gchar *s1, *s2; - gint cmp; - + gint cmp; + gint sort_colid; static int counter = 0; + + g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0); col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_COLUMN)); if (!(++counter % 100)) { @@ -942,10 +1038,27 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, signals[STATUS_UPDATE_SIGNAL], 0, _("Sorting..."), 0, 0); } - switch (col_id) { - - /* first one, we decide based on the time */ + switch (col_id) { case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN: + case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT: + sort_colid = gtk_tree_view_column_get_sort_column_id (GTK_TREE_VIEW_COLUMN(user_data)); + gtk_tree_model_get (tree_model, iter1, + sort_colid, &s1, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, + -1); + gtk_tree_model_get (tree_model, iter2, + sort_colid, &s2, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, + -1); + cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE); + g_free (s1); + g_free (s2); + + return cmp ? cmp : t1 - t2; + + break; + + case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE: case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE: gtk_tree_model_get (tree_model, iter1, @@ -956,7 +1069,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, &t2,-1); return t1 - t2; - case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT: + case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE: case MODEST_HEADER_VIEW_COLUMN_SENT_DATE: gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, @@ -1043,6 +1156,28 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, return cmp ? cmp : t1 - t2; + case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG: + 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); + + int flag_sort = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_FLAG_SORT)); + switch (flag_sort) { + case TNY_HEADER_FLAG_ATTACHMENTS: + cmp = (val1 & TNY_HEADER_FLAG_ATTACHMENTS) - + (val2 & TNY_HEADER_FLAG_ATTACHMENTS); + break; + case TNY_HEADER_FLAG_PRIORITY: + cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) - + (val2 & TNY_HEADER_FLAG_PRIORITY); + break; + default: + cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) - + (val2 & TNY_HEADER_FLAG_PRIORITY); + } + + return cmp ? cmp : t1 - t2; default: return &iter1 - &iter2; /* oughhhh */ } @@ -1054,11 +1189,11 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint time, gpointer data) { - GtkTreeModel *model; + GtkTreeModel *model = NULL; GtkTreeIter iter; - GtkTreePath *source_row; + GtkTreePath *source_row = NULL; - source_row = get_selected_row (GTK_TREE_VIEW(widget), &model); + source_row = get_selected_row (GTK_TREE_VIEW (widget), &model); if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return; switch (info) { @@ -1076,7 +1211,7 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, break; } default: - g_message ("default"); + g_message ("%s: default switch case.", __FUNCTION__); } gtk_tree_path_free (source_row); @@ -1085,8 +1220,7 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, /* Header view drag types */ const GtkTargetEntry header_view_drag_types[] = { { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_APP, MODEST_HEADER_ROW }, - { "text/uri-list", 0, MODEST_MSG }, - + { "text/uri-list", 0, MODEST_MSG }, }; static void @@ -1137,7 +1271,8 @@ on_focus_in (GtkWidget *self, { GtkTreeSelection *selection; GtkTreeModel *model; - GList *selected; + GList *selected = NULL; + GtkTreePath *selected_path = NULL; model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); if (!model) @@ -1149,7 +1284,10 @@ on_focus_in (GtkWidget *self, GtkTreeIter iter; GtkTreePath *path; - gtk_tree_model_get_iter_first (model, &iter); + /* Return if the model is empty */ + if (!gtk_tree_model_get_iter_first (model, &iter)) + return FALSE; + path = gtk_tree_model_get_path (model, &iter); gtk_tree_selection_select_path (selection, path); gtk_tree_path_free (path); @@ -1157,14 +1295,29 @@ on_focus_in (GtkWidget *self, /* Need to get the all the rows because is selection multiple */ selected = gtk_tree_selection_get_selected_rows (selection, &model); - - /* Scroll to first path */ - gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self), - (GtkTreePath *) selected->data, - NULL, - TRUE, - 0.5, - 0.0); + selected_path = (GtkTreePath *) selected->data; + + /* Check if we need to scroll */ + #if GTK_CHECK_VERSION(2, 8, 0) /* TODO: gtk_tree_view_get_visible_range() is only available in GTK+ 2.8 */ + GtkTreePath *start_path = NULL; + GtkTreePath *end_path = NULL; + if (gtk_tree_view_get_visible_range (GTK_TREE_VIEW (self), + &start_path, + &end_path)) { + + if ((gtk_tree_path_compare (start_path, selected_path) != -1) || + (gtk_tree_path_compare (end_path, selected_path) != 1)) { + + /* Scroll to first path */ + gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self), + selected_path, + NULL, + TRUE, + 0.5, + 0.0); + } + } + #endif /* GTK_CHECK_VERSION */ /* Frees */ g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL); @@ -1172,3 +1325,38 @@ on_focus_in (GtkWidget *self, return FALSE; } + +/* + * + */ +static void +folder_monitor_update (TnyFolderObserver *self, + TnyFolderChange *change) +{ + ModestHeaderViewPrivate *priv = MODEST_HEADER_VIEW_GET_PRIVATE (self); + TnyFolderChangeChanged changed; + + g_mutex_lock (priv->observers_lock); + + changed = tny_folder_change_get_changed (change); + + if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) { +/* TnyIterator *iter; */ +/* TnyList *list; */ +/* /\* The added headers *\/ */ +/* list = tny_simple_list_new (); */ +/* tny_folder_change_get_added_headers (change, list); */ +/* iter = tny_list_create_iterator (list); */ +/* while (!tny_iterator_is_done (iter)) */ +/* { */ +/* TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); */ +/* g_object_unref (G_OBJECT (header)); */ +/* tny_iterator_next (iter); */ +/* } */ +/* g_object_unref (G_OBJECT (iter)); */ +/* g_object_unref (G_OBJECT (list)); */ + modest_platform_on_new_msg (); + } + + g_mutex_unlock (priv->observers_lock); +}