X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=03e1ed8bd80302ee2ef597d63e3382de473ce40a;hp=dbd51c05cbe89a1daa85d72e190a604b7a6601e4;hb=aab537f6ce755830767baa7260d7879449ceeb38;hpb=3a7f8e723fd42f95d91fca79bbccaad92d12e5ed diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index dbd51c0..03e1ed8 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -71,6 +71,10 @@ static gboolean filter_row (GtkTreeModel *model, 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); @@ -91,6 +95,21 @@ static void _clipboard_set_selected_data (ModestHeaderView *header_view 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); + +static gboolean modest_header_view_on_expose_event( + GtkTreeView *header_view, + GdkEventExpose *event, + gpointer user_data); + +typedef enum { + HEADER_VIEW_NON_EMPTY, + HEADER_VIEW_EMPTY, + HEADER_VIEW_INIT +} HeaderViewStatus; typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate; struct _ModestHeaderViewPrivate { @@ -100,17 +119,24 @@ 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 selection_changed_handler; + gulong acc_removed_handler; + + HeaderViewStatus status; }; typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper; @@ -503,10 +529,16 @@ modest_header_view_init (ModestHeaderView *obj) 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++) { @@ -524,16 +556,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); } @@ -546,11 +588,17 @@ modest_header_view_finalize (GObject *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); @@ -590,8 +638,8 @@ 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)); - + + 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); @@ -602,6 +650,15 @@ 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); + + g_signal_connect (self, "expose-event", + G_CALLBACK(modest_header_view_on_expose_event), + NULL); + return GTK_WIDGET(self); } @@ -773,13 +830,6 @@ modest_header_view_get_columns (ModestHeaderView *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, @@ -823,6 +873,35 @@ modest_header_view_get_style (ModestHeaderView *self) return MODEST_HEADER_VIEW_GET_PRIVATE(self)->style; } +/* This is used to automatically select the first header if the user + * has not selected any header yet. + */ +static gboolean +modest_header_view_on_expose_event(GtkTreeView *header_view, + GdkEventExpose *event, + gpointer user_data) +{ + GtkTreeSelection *sel; + GtkTreeModel *model; + GtkTreeIter tree_iter; + + /* I'm invalidating this method because it causes an annoying + efect, the focus changes to the header view when selecting + a folder in the folder view because of this code and it + shouldn't. We need to find another way to set the passive + focus on it. Sergio. */ + return FALSE; + + model = gtk_tree_view_get_model(header_view); + + sel = gtk_tree_view_get_selection(header_view); + if(!gtk_tree_selection_count_selected_rows(sel)) + if (gtk_tree_model_get_iter_first(model, &tree_iter)) + gtk_tree_selection_select_iter(sel, &tree_iter); + + return FALSE; +} + /* * This function sets a sortable model in the header view. It's just * used for developing purposes, because it only does a @@ -889,6 +968,9 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers)); g_object_unref (G_OBJECT (headers)); + /* Init filter_row function to examine empty status */ + priv->status = HEADER_VIEW_INIT; + /* Create a tree model filter to hide and show rows for cut operations */ filter_model = gtk_tree_model_filter_new (sortable, NULL); gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model), @@ -920,6 +1002,8 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) /* 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)); */ @@ -1068,18 +1152,17 @@ modest_header_view_set_folder (ModestHeaderView *self, /* Pick my reference. Nothing to do with the mail operation */ priv->folder = g_object_ref (folder); - /* no message selected */ + /* Clear the selection if exists */ + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); + gtk_tree_selection_unselect_all(selection); g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL); + /* create the helper */ info = g_malloc0 (sizeof(SetFolderHelper)); info->header_view = 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 (), @@ -1103,6 +1186,8 @@ modest_header_view_set_folder (ModestHeaderView *self, } modest_header_view_set_model (GTK_TREE_VIEW (self), NULL); + modest_header_view_notify_observers(self, NULL, NULL); + g_mutex_unlock (priv->observers_lock); } } @@ -1292,9 +1377,10 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, 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) { @@ -1315,12 +1401,15 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, 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 */ @@ -1486,9 +1575,10 @@ static void folder_monitor_update (TnyFolderObserver *self, TnyFolderChange *change) { - ModestHeaderViewPrivate *priv; + ModestHeaderViewPrivate *priv = NULL; TnyFolderChangeChanged changed; HeadersCountChangedHelper *helper = NULL; + TnyFolder *folder = NULL; changed = tny_folder_change_get_changed (change); @@ -1496,13 +1586,9 @@ folder_monitor_update (TnyFolderObserver *self, view has changed before this call to the observer happens */ priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (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_ADDED_HEADERS) { - modest_header_view_refilter (MODEST_HEADER_VIEW(self)); - } + folder = tny_folder_change_get_folder (change); + if (folder != priv->folder) + goto frees; /* Check folder count */ if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) || @@ -1510,12 +1596,28 @@ folder_monitor_update (TnyFolderObserver *self, helper = g_slice_new0 (HeadersCountChangedHelper); helper->self = MODEST_HEADER_VIEW(self); helper->change = g_object_ref(change); - - g_idle_add_full (G_PRIORITY_DEFAULT, - idle_notify_headers_count_changed, - helper, - idle_notify_headers_count_changed_destroy); + +/* if (folder != NULL) */ +/* tny_folder_poke_status (folder); */ + + idle_notify_headers_count_changed (helper); + idle_notify_headers_count_changed_destroy (helper); } + + /* Free */ + frees: + if (folder != NULL) + g_object_unref (folder); +} + +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 @@ -1631,8 +1733,10 @@ filter_row (GtkTreeModel *model, visible = !found; } - /* Free */ frees: + priv->status = ((gboolean) priv->status) && !visible; + + /* Free */ if (header) g_object_unref (header); g_free(id); @@ -1643,7 +1747,7 @@ filter_row (GtkTreeModel *model, 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)); @@ -1659,9 +1763,13 @@ _clear_hidding_filter (ModestHeaderView *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)); @@ -1669,25 +1777,90 @@ modest_header_view_refilter (ModestHeaderView *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); - /* Select new path*/ - gtk_tree_selection_select_path (selection, path); + 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); + } } + +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); +} +