#include <tny-list.h>
#include <tny-simple-list.h>
#include <tny-folder-monitor.h>
+#include <tny-folder-change.h>
#include <string.h>
#include <modest-header-view.h>
GtkTreeIter *iter,
gpointer data);
-static void on_selection_changed (GtkTreeSelection *sel,
+static void on_account_removed (TnyAccountStore *self,
+ TnyAccount *account,
+ gpointer user_data);
+
+static void on_selection_changed (GtkTreeSelection *sel,
gpointer user_data);
static void setup_drag_and_drop (GtkTreeView *self);
/* Filter tree model */
gchar **hidding_ids;
- guint n_selected;
-
- gint sort_colid[2][TNY_FOLDER_TYPE_NUM];
- gint sort_type[2][TNY_FOLDER_TYPE_NUM];
+ guint n_selected;
+ gint sort_colid[2][TNY_FOLDER_TYPE_NUM];
+ gint sort_type[2][TNY_FOLDER_TYPE_NUM];
+ gulong selection_changed_handler;
+ gulong acc_removed_handler;
};
typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date_or_status, FALSE);
g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status);
+ g_object_set (G_OBJECT (renderer_subject_box), "yalign", 1.0, NULL);
+ gtk_cell_renderer_set_fixed_size (renderer_subject_box, -1, 32);
+ gtk_cell_renderer_set_fixed_size (renderer_recpt_box, -1, 32);
+ g_object_set (G_OBJECT (renderer_recpt_box), "yalign", 0.0, NULL);
g_object_set(G_OBJECT(renderer_header),
"ellipsize", PANGO_ELLIPSIZE_END,
NULL);
g_object_set (G_OBJECT (renderer_subject),
- "ellipsize", PANGO_ELLIPSIZE_END,
+ "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 1.0,
NULL);
g_object_set (G_OBJECT (renderer_recpt),
- "ellipsize", PANGO_ELLIPSIZE_END,
+ "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0,
NULL);
g_object_set(G_OBJECT(renderer_compact_date_or_status),
- "xalign", 1.0,
+ "xalign", 1.0, "yalign", 0.0,
NULL);
-
- gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 32);
- gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 32);
+ g_object_set (G_OBJECT (renderer_priority),
+ "yalign", 1.0, NULL);
+ g_object_set (G_OBJECT (renderer_attach),
+ "yalign", 0.0, NULL);
+
+ gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 26);
+ gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 26);
+ gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64);
remove_all_columns (self);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
-/* sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); */
tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(tree_filter));
priv->clipboard = modest_runtime_get_email_clipboard ();
priv->hidding_ids = NULL;
priv->n_selected = 0;
+ priv->selection_changed_handler = 0;
+ priv->acc_removed_handler = 0;
/* Sort parameters */
for (j=0; j < 2; j++) {
{
ModestHeaderView *self;
ModestHeaderViewPrivate *priv;
+ GtkTreeSelection *sel;
self = MODEST_HEADER_VIEW(obj);
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+ /* Free in the dispose to avoid unref cycles */
if (priv->folder) {
tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj));
g_object_unref (G_OBJECT (priv->folder));
priv->folder = NULL;
}
+ /* We need to do this here in the dispose because the
+ selection won't exist when finalizing */
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(self));
+ if (sel && g_signal_handler_is_connected (sel, priv->selection_changed_handler)) {
+ g_signal_handler_disconnect (sel, priv->selection_changed_handler);
+ priv->selection_changed_handler = 0;
+ }
+
G_OBJECT_CLASS(parent_class)->dispose (obj);
}
self = MODEST_HEADER_VIEW(obj);
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+ if (g_signal_handler_is_connected (modest_runtime_get_account_store (),
+ priv->acc_removed_handler)) {
+ g_signal_handler_disconnect (modest_runtime_get_account_store (),
+ priv->acc_removed_handler);
+ }
+
g_mutex_lock (priv->observers_lock);
if (priv->monitor) {
tny_folder_monitor_stop (priv->monitor);
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);
+
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+ priv->selection_changed_handler =
+ g_signal_connect_after (sel, "changed",
+ G_CALLBACK(on_selection_changed), self);
g_signal_connect (self, "row-activated",
G_CALLBACK (on_header_row_activated), NULL);
g_signal_connect (self, "focus-in-event",
G_CALLBACK(on_focus_in), NULL);
+ priv->acc_removed_handler = g_signal_connect (modest_runtime_get_account_store (),
+ "account_removed",
+ G_CALLBACK (on_account_removed),
+ self);
+
return GTK_WIDGET(self);
}
static void
folder_refreshed_cb (ModestMailOperation *mail_op,
- TnyFolder *folder,
+ TnyFolder *folder,
gpointer user_data)
{
ModestHeaderViewPrivate *priv;
if (folder) {
ModestMailOperation *mail_op = NULL;
+ GtkTreeSelection *selection;
/* Get main window to use it as source of mail operation */
mgr = modest_runtime_get_window_mgr ();
info->cb = callback;
info->user_data = user_data;
+ /* bug 57631: Clear the selection if exists */
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+ gtk_tree_selection_unselect_all(selection);
+
/* Create the mail operation (source will be the parent widget) */
mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, source);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
/* Refresh the folder asynchronously */
- modest_mail_operation_refresh_folder (mail_op,
+ modest_mail_operation_refresh_folder (mail_op,
folder,
folder_refreshed_cb,
info);
on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
{
GtkTreeModel *model;
- TnyHeader *header;
+ TnyHeader *header = NULL;
GtkTreePath *path = NULL;
GtkTreeIter iter;
ModestHeaderView *self;
GtkTreeModel *model = NULL;
GtkTreeIter iter;
GtkTreePath *source_row = NULL;
+ GtkTreeSelection *sel = NULL;
source_row = get_selected_row (GTK_TREE_VIEW (widget), &model);
if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
gtk_tree_set_row_drag_data (selection_data, model, source_row);
break;
case MODEST_MSG: {
- TnyHeader *hdr;
+ TnyHeader *hdr = NULL;
gtk_tree_model_get (model, &iter,
TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &hdr,
-1);
g_message ("%s: default switch case.", __FUNCTION__);
}
+ /* Set focus on next header */
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW (widget));
+ gtk_tree_path_next (source_row);
+ gtk_tree_selection_select_path (sel, source_row);
+
gtk_tree_path_free (source_row);
}
if (tny_folder_change_get_folder (change) != priv->folder)
return;
+ /* Check header removed (hide marked as DELETED headers) */
+ if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) {
+ modest_header_view_refilter (MODEST_HEADER_VIEW(self));
+ }
+
/* Check folder count */
if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) ||
(changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)) {
if (GTK_IS_TREE_MODEL_FILTER (model))
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
}
+
+/*
+ * Called when an account is removed. If I'm showing a folder of the
+ * account that has been removed then clear the view
+ */
+static void
+on_account_removed (TnyAccountStore *self,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ ModestHeaderViewPrivate *priv = NULL;
+
+ /* Ignore changes in transport accounts */
+ if (TNY_IS_TRANSPORT_ACCOUNT (account))
+ return;
+
+ g_print ("--------------------- HEADER ---------------\n");
+
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data);
+
+ if (priv->folder) {
+ TnyAccount *my_account;
+
+ my_account = tny_folder_get_account (priv->folder);
+ if (my_account == account)
+ modest_header_view_clear (MODEST_HEADER_VIEW (user_data));
+ g_object_unref (account);
+ }
+}
projects / modest / blobdiff