X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=bee32a621ebcc1186ee849fbb765ae8d497356f3;hp=5bbaa0fa0e156da336a3cba7be83b2515fc3679b;hb=362784ce756b3f0e31cd451d9ac5e69b909d4053;hpb=8a821d22130a023dbd639d6a9117245320cb3a2b diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 5bbaa0f..bee32a6 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -70,7 +71,11 @@ static gboolean filter_row (GtkTreeModel *model, 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); @@ -104,12 +109,13 @@ struct _ModestHeaderViewPrivate { /* 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; @@ -283,7 +289,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn GtkTreeViewColumn *column=NULL; GtkTreeSelection *selection = NULL; GtkCellRenderer *renderer_msgtype,*renderer_header, - *renderer_attach, *renderer_compact_date; + *renderer_attach, *renderer_compact_date_or_status; GtkCellRenderer *renderer_compact_header, *renderer_recpt_box, *renderer_subject, *renderer_subject_box, *renderer_recpt, *renderer_priority; @@ -304,7 +310,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn renderer_subject_box = modest_hbox_cell_renderer_new (); renderer_recpt = gtk_cell_renderer_text_new (); renderer_subject = gtk_cell_renderer_text_new (); - renderer_compact_date = gtk_cell_renderer_text_new (); + renderer_compact_date_or_status = gtk_cell_renderer_text_new (); modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_subject_box, FALSE); g_object_set_data (G_OBJECT (renderer_compact_header), "subject-box-renderer", renderer_subject_box); @@ -318,30 +324,38 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn g_object_set_data (G_OBJECT (renderer_recpt_box), "attach-renderer", renderer_attach); modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_recpt, TRUE); g_object_set_data (G_OBJECT (renderer_recpt_box), "recipient-renderer", renderer_recpt); - modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date, FALSE); - g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date); + 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), - "xalign", 1.0, + g_object_set(G_OBJECT(renderer_compact_date_or_status), + "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)); @@ -397,16 +411,18 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, FALSE, (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data, - GINT_TO_POINTER(TRUE)); + GINT_TO_POINTER(MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_IN)); compact_column = column; break; case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT: column = get_new_column (_("Header"), renderer_compact_header, TRUE, - TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, - FALSE, - (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data, - GINT_TO_POINTER(FALSE)); + TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, + FALSE, + (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data, + GINT_TO_POINTER((type == TNY_FOLDER_TYPE_OUTBOX)? + MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX: + MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUT)); compact_column = column; break; @@ -443,7 +459,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn NULL); break; case MODEST_HEADER_VIEW_COLUMN_STATUS: - column = get_new_column (_("Status"), renderer_compact_date, TRUE, + column = get_new_column (_("Status"), renderer_compact_date_or_status, TRUE, TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, FALSE, (GtkTreeCellDataFunc)_modest_header_view_status_cell_data, @@ -495,6 +511,8 @@ modest_header_view_init (ModestHeaderView *obj) 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++) { @@ -512,16 +530,26 @@ modest_header_view_dispose (GObject *obj) { 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); } @@ -534,6 +562,12 @@ modest_header_view_finalize (GObject *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); @@ -573,10 +607,11 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style) 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); @@ -584,6 +619,11 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style) 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); } @@ -988,8 +1028,8 @@ typedef struct { } SetFolderHelper; static void -folder_refreshed_cb (const GObject *obj, - TnyFolder *folder, +folder_refreshed_cb (ModestMailOperation *mail_op, + TnyFolder *folder, gpointer user_data) { ModestHeaderViewPrivate *priv; @@ -1001,7 +1041,7 @@ folder_refreshed_cb (const GObject *obj, /* User callback */ if (info->cb) - info->cb (obj, folder, info->user_data); + info->cb (mail_op, folder, info->user_data); /* Start the folder count changes observer. We do not need it before the refresh. Note that the monitor could still be @@ -1038,6 +1078,7 @@ modest_header_view_set_folder (ModestHeaderView *self, 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 (); @@ -1057,13 +1098,17 @@ modest_header_view_set_folder (ModestHeaderView *self, 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); @@ -1092,27 +1137,37 @@ on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path, ModestHeaderViewPrivate *priv = NULL; GtkTreeIter iter; GtkTreeModel *model = NULL; - TnyHeader *header; + TnyHeader *header = NULL; + TnyHeaderFlags flags; self = MODEST_HEADER_VIEW (treeview); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - model = gtk_tree_view_get_model (treeview); - + model = gtk_tree_view_get_model (treeview); if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) - return; - + goto frees; + /* get the first selected item */ gtk_tree_model_get (model, &iter, - TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, - &header, -1); + TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, + -1); + + /* Dont open DELETED messages */ + if (flags & TNY_HEADER_FLAG_DELETED) { + modest_platform_information_banner (NULL, NULL, _("mcen_ib_message_already_deleted")); + goto frees; + } + /* Emit signal */ g_signal_emit (G_OBJECT(self), signals[HEADER_ACTIVATED_SIGNAL], 0, header); /* Free */ - g_object_unref (G_OBJECT (header)); + frees: + if (header != NULL) + g_object_unref (G_OBJECT (header)); } @@ -1120,7 +1175,7 @@ static void on_selection_changed (GtkTreeSelection *sel, gpointer user_data) { GtkTreeModel *model; - TnyHeader *header; + TnyHeader *header = NULL; GtkTreePath *path = NULL; GtkTreeIter iter; ModestHeaderView *self; @@ -1149,7 +1204,10 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) 0, header); g_object_unref (G_OBJECT (header)); - gtk_tree_path_free(path); + + /* free all items in 'selected' */ + g_list_foreach (selected, (GFunc)gtk_tree_path_free, NULL); + g_list_free (selected); } @@ -1256,6 +1314,7 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, 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; @@ -1265,7 +1324,7 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, 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); @@ -1278,6 +1337,11 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, 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); } @@ -1382,6 +1446,11 @@ on_focus_in (GtkWidget *self, 0.0); } } + if (start_path) + gtk_tree_path_free (start_path); + if (end_path) + gtk_tree_path_free (end_path); + #endif /* GTK_CHECK_VERSION */ /* Frees */ @@ -1418,10 +1487,13 @@ idle_notify_headers_count_changed (gpointer data) folder = tny_folder_change_get_folder (helper->change); priv = MODEST_HEADER_VIEW_GET_PRIVATE (helper->self); + g_mutex_lock (priv->observers_lock); - /* Emmit signal to evaluate how headers changes affects to the window view */ - g_signal_emit (G_OBJECT(helper->self), signals[MSG_COUNT_CHANGED_SIGNAL], 0, folder, helper->change); + /* Emit signal to evaluate how headers changes affects to the window view */ + g_signal_emit (G_OBJECT(helper->self), + signals[MSG_COUNT_CHANGED_SIGNAL], + 0, folder, helper->change); /* Added or removed headers, so data stored on cliboard are invalid */ if (modest_email_clipboard_check_source_folder (priv->clipboard, folder)) @@ -1449,9 +1521,14 @@ folder_monitor_update (TnyFolderObserver *self, 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_REMOVED_HEADERS)) { + (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)) { helper = g_slice_new0 (HeadersCountChangedHelper); helper->self = MODEST_HEADER_VIEW(self); helper->change = g_object_ref(change); @@ -1480,7 +1557,6 @@ void modest_header_view_cut_selection (ModestHeaderView *header_view) { ModestHeaderViewPrivate *priv = NULL; - GtkTreeModel *model = NULL; const gchar **hidding = NULL; guint i, n_selected; @@ -1503,9 +1579,7 @@ modest_header_view_cut_selection (ModestHeaderView *header_view) priv->hidding_ids[i] = g_strdup(hidding[i]); /* Hide cut headers */ - model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); - if (GTK_IS_TREE_MODEL_FILTER (model)) - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); + modest_header_view_refilter (header_view); } @@ -1538,37 +1612,54 @@ filter_row (GtkTreeModel *model, gpointer user_data) { ModestHeaderViewPrivate *priv = NULL; + TnyHeaderFlags flags; TnyHeader *header = NULL; guint i; gchar *id = NULL; + gboolean visible = TRUE; gboolean found = FALSE; g_return_val_if_fail (MODEST_IS_HEADER_VIEW (user_data), FALSE); priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data); - /* If no data on clipboard, return always TRUE */ - if (modest_email_clipboard_cleared(priv->clipboard)) return TRUE; - /* Get header from model */ gtk_tree_model_get (model, iter, + TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); + /* Hide mark as deleted heders */ + if (flags & TNY_HEADER_FLAG_DELETED) { + visible = FALSE; + goto frees; + } + + /* If no data on clipboard, return always TRUE */ + if (modest_email_clipboard_cleared(priv->clipboard)) { + visible = TRUE; + goto frees; + } + /* Get message id from header (ensure is a valid id) */ if (!header) return FALSE; id = g_strdup(tny_header_get_message_id (header)); /* Check hiding */ - if (priv->hidding_ids != NULL) + if (priv->hidding_ids != NULL) { for (i=0; i < priv->n_selected && !found; i++) if (priv->hidding_ids[i] != NULL && id != NULL) found = (!strcmp (priv->hidding_ids[i], id)); + visible = !found; + } + /* Free */ - g_object_unref (header); + frees: + if (header) + g_object_unref (header); g_free(id); - return !found; + return visible; } static void @@ -1586,3 +1677,45 @@ _clear_hidding_filter (ModestHeaderView *header_view) g_free(priv->hidding_ids); } } + +void +modest_header_view_refilter (ModestHeaderView *header_view) +{ + GtkTreeModel *model; + + g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + + /* Hide cut headers */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); + 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); + } +}