GtkTreeIter *iter,
gpointer data);
+static void on_account_removed (TnyAccountStore *self,
+ TnyAccount *account,
+ gpointer user_data);
+
static void on_selection_changed (GtkTreeSelection *sel,
gpointer user_data);
static void _clear_hidding_filter (ModestHeaderView *header_view);
+static void modest_header_view_notify_observers(
+ ModestHeaderView *header_view,
+ GtkTreeModel *model,
+ const gchar *tny_folder_id);
+
+
+
+typedef enum {
+ HEADER_VIEW_NON_EMPTY,
+ HEADER_VIEW_EMPTY,
+ HEADER_VIEW_INIT
+} HeaderViewStatus;
typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
struct _ModestHeaderViewPrivate {
TnyFolderMonitor *monitor;
GMutex *observers_lock;
+ /*header-view-observer observer*/
+ GMutex *observer_list_lock;
+ GSList *observer_list;
+
/* not unref this object, its a singlenton */
ModestEmailClipboard *clipboard;
/* Filter tree model */
- gchar **hidding_ids;
- guint n_selected;
+ gchar **hidding_ids;
+ guint n_selected;
+
+ gint sort_colid[2][TNY_FOLDER_TYPE_NUM];
+ gint sort_type[2][TNY_FOLDER_TYPE_NUM];
- gint sort_colid[2][TNY_FOLDER_TYPE_NUM];
- gint sort_type[2][TNY_FOLDER_TYPE_NUM];
+ gulong selection_changed_handler;
+ gulong acc_removed_handler;
- gulong selection_changed_handler;
+ HeaderViewStatus status;
};
typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
priv->monitor = NULL;
priv->observers_lock = g_mutex_new ();
+ priv->status = HEADER_VIEW_INIT;
+
+ priv->observer_list_lock = g_mutex_new();
+ priv->observer_list = NULL;
+
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 (priv->selection_changed_handler) {
- g_signal_handler_disconnect (self, priv->selection_changed_handler);
- priv->selection_changed_handler = 0;
+ 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);
}
+ /* There is no need to lock because there should not be any
+ * reference to self now. */
+ g_mutex_free(priv->observer_list_lock);
+ g_slist_free(priv->observer_list);
+
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));
-
+
+ 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, "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);
}
}
-gboolean
-modest_header_view_is_empty (ModestHeaderView *self)
-{
- g_return_val_if_fail (self, FALSE);
- return FALSE; /* FIXME */
-}
-
gboolean
modest_header_view_set_style (ModestHeaderView *self,
/* Set new model */
modest_header_view_set_model (GTK_TREE_VIEW (self), filter_model);
+ modest_header_view_notify_observers(self, GTK_TREE_MODEL(filter_model),
+ tny_folder_get_id(folder));
g_object_unref (G_OBJECT (filter_model));
/* modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); */
/* g_object_unref (G_OBJECT (sortable)); */
}
modest_header_view_set_model (GTK_TREE_VIEW (self), NULL);
+ modest_header_view_notify_observers(self, NULL, NULL);
+
g_mutex_unlock (priv->observers_lock);
}
}
GtkTreeModel *model = NULL;
GtkTreeIter iter;
GtkTreePath *source_row = NULL;
- GtkTreeSelection *sel = 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;
switch (info) {
g_message ("%s: default switch case.", __FUNCTION__);
}
+ /* commenting out the next, fixes NB#62963 */
+#if 0
/* 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);
+#endif
}
/* Header view drag types */
folder_monitor_update (TnyFolderObserver *self,
TnyFolderChange *change)
{
- ModestHeaderViewPrivate *priv;
+ ModestHeaderViewPrivate *priv = NULL;
TnyFolderChangeChanged changed;
HeadersCountChangedHelper *helper = NULL;
if (tny_folder_change_get_folder (change) != priv->folder)
return;
- /* Check header removed (hide marked as DELETED headers) */
- if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_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)) {
}
}
+gboolean
+modest_header_view_is_empty (ModestHeaderView *self)
+{
+ ModestHeaderViewPrivate *priv = NULL;
+
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (self));
+
+ return priv->status == HEADER_VIEW_EMPTY;
+}
+
void
modest_header_view_clear (ModestHeaderView *self)
{
visible = !found;
}
- /* Free */
frees:
+ priv->status = priv->status && !visible;
+
+ /* Free */
if (header)
g_object_unref (header);
g_free(id);
static void
_clear_hidding_filter (ModestHeaderView *header_view)
{
- ModestHeaderViewPrivate *priv;
+ ModestHeaderViewPrivate *priv = NULL;
guint i;
g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
void
modest_header_view_refilter (ModestHeaderView *header_view)
{
- GtkTreeModel *model;
+ GtkTreeModel *model = NULL;
+ ModestHeaderViewPrivate *priv = NULL;
g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+ priv->status = HEADER_VIEW_EMPTY;
/* Hide cut headers */
model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
}
-/**
- * Protected method, selects a row pointed by path
- **/
-void
-_modest_header_view_select_from_path (ModestHeaderView *self,
- GtkTreePath *path)
+/*
+ * 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)
{
- GtkTreeSelection *selection = NULL;
- ModestHeaderViewPrivate *priv;
-
- g_return_if_fail (MODEST_HEADER_VIEW (self));
- g_return_if_fail (path != NULL);
+ ModestHeaderViewPrivate *priv = NULL;
- priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+ /* Ignore changes in transport accounts */
+ if (TNY_IS_TRANSPORT_ACCOUNT (account))
+ return;
+
+ g_print ("--------------------- HEADER ---------------\n");
- /* Unselect previous selection */
- gtk_tree_selection_unselect_all (selection);
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data);
+
+ if (priv->folder) {
+ TnyAccount *my_account;
- /* Select new path*/
- gtk_tree_selection_select_path (selection, path);
+ 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);
+ }
}
+
+void modest_header_view_add_observer(
+ ModestHeaderView *header_view,
+ ModestHeaderViewObserver *observer)
+{
+ ModestHeaderViewPrivate *priv = NULL;
+
+ g_assert(MODEST_IS_HEADER_VIEW(header_view));
+ g_assert(observer != NULL);
+ g_assert(MODEST_IS_HEADER_VIEW_OBSERVER(observer));
+
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+ g_mutex_lock(priv->observer_list_lock);
+ priv->observer_list = g_slist_prepend(priv->observer_list, observer);
+ g_mutex_unlock(priv->observer_list_lock);
+}
+
+void modest_header_view_remove_observer(
+ ModestHeaderView *header_view,
+ ModestHeaderViewObserver *observer)
+{
+ ModestHeaderViewPrivate *priv = NULL;
+
+ g_assert(MODEST_IS_HEADER_VIEW(header_view));
+ g_assert(observer != NULL);
+ g_assert(MODEST_IS_HEADER_VIEW_OBSERVER(observer));
+
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+ g_mutex_lock(priv->observer_list_lock);
+ priv->observer_list = g_slist_remove(priv->observer_list, observer);
+ g_mutex_unlock(priv->observer_list_lock);
+}
+
+static void modest_header_view_notify_observers(
+ ModestHeaderView *header_view,
+ GtkTreeModel *model,
+ const gchar *tny_folder_id)
+{
+ ModestHeaderViewPrivate *priv = NULL;
+ GSList *iter;
+ ModestHeaderViewObserver *observer;
+
+ g_assert(MODEST_IS_HEADER_VIEW(header_view));
+
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+ g_mutex_lock(priv->observer_list_lock);
+ iter = priv->observer_list;
+ while(iter != NULL){
+ observer = MODEST_HEADER_VIEW_OBSERVER(iter->data);
+ modest_header_view_observer_update(observer, model,
+ tny_folder_id);
+ iter = g_slist_next(iter);
+ }
+ g_mutex_unlock(priv->observer_list_lock);
+}
+