X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=a7e264ba11faeab717c705522d26b167a31104fb;hb=4a4e446d6461811d75e3f6b62f38bda2b9e4e975;hp=097c2e6c00490bc24e9d7ccc3c206ead2b1d8d95;hpb=e6e47a585ad133232fe1aebbad2352bf68d9461c;p=modest diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 097c2e6..a7e264b 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -71,10 +71,24 @@ 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); +static gboolean on_button_press_event (GtkWidget * self, GdkEventButton * event, + gpointer userdata); + +static gboolean on_button_release_event(GtkWidget * self, GdkEventButton * event, + gpointer userdata); + +static void setup_drag_and_drop (GtkWidget *self); + +static void enable_drag_and_drop (GtkWidget *self); + +static void disable_drag_and_drop (GtkWidget *self); static GtkTreePath * get_selected_row (GtkTreeView *self, GtkTreeModel **model); @@ -82,6 +96,10 @@ static gboolean on_focus_in (GtkWidget *sef, GdkEventFocus *event, gpointer user_data); +static gboolean on_focus_out (GtkWidget *self, + GdkEventFocus *event, + gpointer user_data); + static void folder_monitor_update (TnyFolderObserver *self, TnyFolderChange *change); @@ -91,6 +109,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 +133,25 @@ 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; + 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; + HeaderViewStatus status; + GList *drag_begin_cached_selected_rows; }; typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper; @@ -133,6 +174,7 @@ enum { HEADER_ACTIVATED_SIGNAL, ITEM_NOT_FOUND_SIGNAL, MSG_COUNT_CHANGED_SIGNAL, + UPDATING_MSG_LIST_SIGNAL, LAST_SIGNAL }; @@ -226,6 +268,15 @@ modest_header_view_class_init (ModestHeaderViewClass *klass) NULL, NULL, modest_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); + + signals[UPDATING_MSG_LIST_SIGNAL] = + g_signal_new ("updating-msg-list", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestHeaderViewClass, updating_msg_list), + NULL, NULL, + g_cclosure_marshal_VOID__BOOLEAN, + G_TYPE_NONE, 1, G_TYPE_BOOLEAN); } static void @@ -322,27 +373,35 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn 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)); @@ -495,9 +554,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++) { @@ -507,7 +573,7 @@ modest_header_view_init (ModestHeaderView *obj) } } - setup_drag_and_drop (GTK_TREE_VIEW (obj)); + setup_drag_and_drop (GTK_WIDGET(obj)); } static void @@ -515,16 +581,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); } @@ -537,6 +613,17 @@ 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); + } + + /* 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); @@ -568,7 +655,6 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style) priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); modest_header_view_set_style (self, style); -/* modest_header_view_set_folder (self, NULL, NULL, NULL); */ gtk_tree_view_columns_autosize (GTK_TREE_VIEW(obj)); gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(obj),TRUE); @@ -576,17 +662,34 @@ 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); g_signal_connect (self, "focus-in-event", G_CALLBACK(on_focus_in), NULL); + g_signal_connect (self, "focus-out-event", + G_CALLBACK(on_focus_out), NULL); + + g_signal_connect (self, "button-press-event", + G_CALLBACK(on_button_press_event), NULL); + g_signal_connect (self, "button-release-event", + G_CALLBACK(on_button_release_event), 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); } @@ -758,13 +861,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, @@ -808,6 +904,33 @@ 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; + + 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)) { + /* Prevent the widget from getting the focus + when selecting the first item */ + g_object_set(header_view, "can-focus", FALSE, NULL); + gtk_tree_selection_select_iter(sel, &tree_iter); + g_object_set(header_view, "can-focus", TRUE, NULL); + } + + return FALSE; +} + /* * This function sets a sortable model in the header view. It's just * used for developing purposes, because it only does a @@ -857,7 +980,7 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) headers = TNY_LIST (tny_gtk_header_list_model_new ()); tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers), - folder, FALSE); + folder, FALSE, NULL, NULL, NULL); /* Add IDLE observer (monitor) and another folder observer for new messages (self) */ @@ -874,6 +997,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), @@ -905,6 +1031,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)); */ @@ -992,7 +1120,7 @@ typedef struct { static void folder_refreshed_cb (ModestMailOperation *mail_op, - TnyFolder *folder, + TnyFolder *folder, gpointer user_data) { ModestHeaderViewPrivate *priv; @@ -1014,6 +1142,10 @@ folder_refreshed_cb (ModestMailOperation *mail_op, tny_folder_add_observer (folder, TNY_FOLDER_OBSERVER (info->header_view)); g_mutex_unlock (priv->observers_lock); + /* Notify the observers that the update is over */ + g_signal_emit (G_OBJECT (info->header_view), + signals[UPDATING_MSG_LIST_SIGNAL], 0, FALSE, NULL); + /* Frees */ g_free (info); } @@ -1041,7 +1173,7 @@ modest_header_view_set_folder (ModestHeaderView *self, if (folder) { ModestMailOperation *mail_op = NULL; - GtkTreeSelection *selection; + GtkTreeSelection *selection; /* Get main window to use it as source of mail operation */ mgr = modest_runtime_get_window_mgr (); @@ -1053,25 +1185,28 @@ 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); + /* Notify the observers that the update begins */ + g_signal_emit (G_OBJECT (self), signals[UPDATING_MSG_LIST_SIGNAL], + 0, TRUE, 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); + mail_op = modest_mail_operation_new (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); @@ -1088,7 +1223,13 @@ 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); + + /* Notify the observers that the update is over */ + g_signal_emit (G_OBJECT (self), signals[UPDATING_MSG_LIST_SIGNAL], + 0, FALSE, NULL); } } @@ -1138,7 +1279,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; @@ -1270,61 +1411,108 @@ cmp_subject_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *ite /* Drag and drop stuff */ static void -drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, +drag_data_get_cb (GtkWidget *widget, + GdkDragContext *context, GtkSelectionData *selection_data, - guint info, guint time, gpointer data) + guint info, + guint time, + gpointer data) { - 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; + ModestHeaderView *self = NULL; + ModestHeaderViewPrivate *priv = NULL; - switch (info) { - case MODEST_HEADER_ROW: - gtk_tree_set_row_drag_data (selection_data, model, source_row); - break; - case MODEST_MSG: { - TnyHeader *hdr; - gtk_tree_model_get (model, &iter, - TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &hdr, - -1); - if (hdr) { - g_object_unref (G_OBJECT(hdr)); - } - break; - } - default: - g_message ("%s: default switch case.", __FUNCTION__); - } + self = MODEST_HEADER_VIEW (widget); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + /* Set the data. Do not use the current selection because it + could be different than the selection at the beginning of + the d&d */ + modest_dnd_selection_data_set_paths (selection_data, + priv->drag_begin_cached_selected_rows); +} + +/** + * We're caching the selected rows at the beginning because the + * selection could change between drag-begin and drag-data-get, for + * example if we have a set of rows already selected, and then we + * click in one of them (without SHIFT key pressed) and begin a drag, + * the selection at that moment contains all the selected lines, but + * after dropping the selection, the release event provokes that only + * the row used to begin the drag is selected, so at the end the + * drag&drop affects only one rows instead of all the selected ones. + * + */ +static void +drag_begin_cb (GtkWidget *widget, + GdkDragContext *context, + gpointer data) +{ + ModestHeaderView *self = NULL; + ModestHeaderViewPrivate *priv = NULL; + GtkTreeSelection *selection; - /* 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); + self = MODEST_HEADER_VIEW (widget); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - gtk_tree_path_free (source_row); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); + priv->drag_begin_cached_selected_rows = + gtk_tree_selection_get_selected_rows (selection, NULL); +} + +/** + * We use the drag-end signal to clear the cached selection, we use + * this because this allways happens, whether or not the d&d was a + * success + */ +static void +drag_end_cb (GtkWidget *widget, + GdkDragContext *dc, + gpointer data) +{ + ModestHeaderView *self = NULL; + ModestHeaderViewPrivate *priv = NULL; + + self = MODEST_HEADER_VIEW (widget); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + /* Free cached data */ + g_list_foreach (priv->drag_begin_cached_selected_rows, (GFunc) gtk_tree_path_free, NULL); + g_list_free (priv->drag_begin_cached_selected_rows); + priv->drag_begin_cached_selected_rows = NULL; } /* 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 }, + { GTK_TREE_PATH_AS_STRING_LIST, GTK_TARGET_SAME_APP, MODEST_HEADER_ROW } }; static void -setup_drag_and_drop (GtkTreeView *self) +enable_drag_and_drop (GtkWidget *self) { - gtk_drag_source_set (GTK_WIDGET (self), - GDK_BUTTON1_MASK, + gtk_drag_source_set (self, GDK_BUTTON1_MASK, header_view_drag_types, G_N_ELEMENTS (header_view_drag_types), GDK_ACTION_MOVE | GDK_ACTION_COPY); +} + +static void +disable_drag_and_drop (GtkWidget *self) +{ + gtk_drag_source_unset (self); +} +static void +setup_drag_and_drop (GtkWidget *self) +{ + enable_drag_and_drop(self); g_signal_connect(G_OBJECT (self), "drag_data_get", G_CALLBACK(drag_data_get_cb), NULL); + + g_signal_connect(G_OBJECT (self), "drag_begin", + G_CALLBACK(drag_begin_cb), NULL); + + g_signal_connect(G_OBJECT (self), "drag_end", + G_CALLBACK(drag_end_cb), NULL); } static GtkTreePath * @@ -1423,46 +1611,58 @@ on_focus_in (GtkWidget *self, return FALSE; } -static void -idle_notify_headers_count_changed_destroy (gpointer data) +static gboolean +on_focus_out (GtkWidget *self, + GdkEventFocus *event, + gpointer user_data) { - HeadersCountChangedHelper *helper = NULL; - g_return_if_fail (data != NULL); - helper = (HeadersCountChangedHelper *) data; - - g_object_unref (helper->change); - g_slice_free (HeadersCountChangedHelper, helper); + if (!gtk_widget_is_focus (self)) { + GtkTreeSelection *selection = NULL; + GList *selected_rows = NULL; + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + if (gtk_tree_selection_count_selected_rows (selection) > 1) { + selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL); + g_signal_handlers_block_by_func (selection, on_selection_changed, self); + gtk_tree_selection_unselect_all (selection); + gtk_tree_selection_select_path (selection, (GtkTreePath *) selected_rows->data); + g_signal_handlers_unblock_by_func (selection, on_selection_changed, self); + g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL); + g_list_free (selected_rows); + } + } + return FALSE; } static gboolean -idle_notify_headers_count_changed (gpointer data) +on_button_release_event(GtkWidget * self, GdkEventButton * event, gpointer userdata) { - TnyFolder *folder = NULL; - ModestHeaderViewPrivate *priv = NULL; - HeadersCountChangedHelper *helper = NULL; - - g_return_val_if_fail (data != NULL, FALSE); - helper = (HeadersCountChangedHelper *) data; - g_return_val_if_fail (MODEST_IS_HEADER_VIEW(helper->self), FALSE); - g_return_val_if_fail (TNY_FOLDER_CHANGE(helper->change), FALSE); + enable_drag_and_drop(self); + return FALSE; +} - folder = tny_folder_change_get_folder (helper->change); +static gboolean +on_button_press_event(GtkWidget * self, GdkEventButton * event, gpointer userdata) +{ + GtkTreeSelection *selection = NULL; + GtkTreePath *path = NULL; + gboolean already_selected = FALSE; - priv = MODEST_HEADER_VIEW_GET_PRIVATE (helper->self); + if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(self), event->x, event->y, &path, NULL, NULL, NULL)) { + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); + already_selected = gtk_tree_selection_path_is_selected (selection, path); + } - g_mutex_lock (priv->observers_lock); + /* Enable drag and drop onlly if the user clicks on a row that + it's already selected. If not, let him select items using + the pointer */ + if (!already_selected) { + disable_drag_and_drop(self); + } - /* 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)) - modest_email_clipboard_clear (priv->clipboard); - - g_mutex_unlock (priv->observers_lock); + if (path != NULL) { + gtk_tree_path_free(path); + } return FALSE; } @@ -1471,9 +1671,9 @@ 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); @@ -1481,21 +1681,43 @@ 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; + folder = tny_folder_change_get_folder (change); + if (folder != priv->folder) + goto frees; /* Check folder count */ if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_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); + + g_mutex_lock (priv->observers_lock); + + /* Emit signal to evaluate how headers changes affects + to the window view */ + g_signal_emit (G_OBJECT(self), + signals[MSG_COUNT_CHANGED_SIGNAL], + 0, folder, change); - g_idle_add_full (G_PRIORITY_DEFAULT, - idle_notify_headers_count_changed, - helper, - idle_notify_headers_count_changed_destroy); + /* Added or removed headers, so data stored on cliboard are invalid */ + if (modest_email_clipboard_check_source_folder (priv->clipboard, folder)) + modest_email_clipboard_clear (priv->clipboard); + + g_mutex_unlock (priv->observers_lock); } + + /* 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 @@ -1611,8 +1833,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); @@ -1623,7 +1847,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)); @@ -1639,12 +1863,102 @@ _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); /* Hide cut headers */ model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); - if (GTK_IS_TREE_MODEL_FILTER (model)) + if (GTK_IS_TREE_MODEL_FILTER (model)) { + priv->status = 0; 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; + + 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); + } +} + +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); +} +