X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=72da5b9400009a9bb14deab240e9839120a2f574;hp=1b77fbcf77b7ddc515b7c43f0f87f53b7122111f;hb=2ec979376a461aa861afae9328230144ae4e06b3;hpb=405ed1c667ac24177bf99956f8ce96a4e9f469c7 diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 1b77fbc..72da5b9 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -32,15 +32,16 @@ #include #include #include +#include #include #include #include #include #include - +#include #include - +#include #include #include #include @@ -78,7 +79,17 @@ static void on_account_removed (TnyAccountStore *self, 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); @@ -86,6 +97,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); @@ -100,10 +115,9 @@ static void modest_header_view_notify_observers( GtkTreeModel *model, const gchar *tny_folder_id); -static gboolean modest_header_view_on_expose_event( - GtkTreeView *header_view, - GdkEventExpose *event, - gpointer user_data); +static gboolean modest_header_view_on_expose_event (GtkTreeView *header_view, + GdkEventExpose *event, + gpointer user_data); typedef enum { HEADER_VIEW_NON_EMPTY, @@ -136,7 +150,11 @@ struct _ModestHeaderViewPrivate { gulong selection_changed_handler; gulong acc_removed_handler; + GList *drag_begin_cached_selected_rows; + HeaderViewStatus status; + guint status_timeout; + gboolean notify_status; /* whether or not the filter_row should notify about changes in the filtering */ }; typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper; @@ -159,6 +177,7 @@ enum { HEADER_ACTIVATED_SIGNAL, ITEM_NOT_FOUND_SIGNAL, MSG_COUNT_CHANGED_SIGNAL, + UPDATING_MSG_LIST_SIGNAL, LAST_SIGNAL }; @@ -252,12 +271,21 @@ 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 tny_folder_observer_init (TnyFolderObserverIface *klass) { - klass->update_func = folder_monitor_update; + klass->update = folder_monitor_update; } static GtkTreeViewColumn* @@ -317,6 +345,9 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn ModestHeaderViewPrivate *priv; GtkTreeViewColumn *compact_column = NULL; const GList *cursor; + + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE); + g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, FALSE); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -358,12 +389,15 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn g_object_set (G_OBJECT (renderer_subject), "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 1.0, NULL); + gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_subject), 1); g_object_set (G_OBJECT (renderer_recpt), "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0, NULL); + gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_recpt), 1); g_object_set(G_OBJECT(renderer_compact_date_or_status), "xalign", 1.0, "yalign", 0.0, NULL); + gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_compact_date_or_status), 1); g_object_set (G_OBJECT (renderer_priority), "yalign", 1.0, NULL); g_object_set (G_OBJECT (renderer_attach), @@ -530,6 +564,8 @@ modest_header_view_init (ModestHeaderView *obj) priv->observers_lock = g_mutex_new (); priv->status = HEADER_VIEW_INIT; + priv->status_timeout = 0; + priv->notify_status = TRUE; priv->observer_list_lock = g_mutex_new(); priv->observer_list = NULL; @@ -548,7 +584,7 @@ modest_header_view_init (ModestHeaderView *obj) } } - setup_drag_and_drop (GTK_TREE_VIEW (obj)); + setup_drag_and_drop (GTK_WIDGET(obj)); } static void @@ -630,7 +666,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); @@ -649,6 +684,13 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style) 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", @@ -669,7 +711,7 @@ modest_header_view_count_selected_headers (ModestHeaderView *self) GtkTreeSelection *sel; guint selected_rows; - g_return_val_if_fail (self, 0); + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), 0); /* Get selection object and check selected rows count */ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); @@ -683,8 +725,8 @@ modest_header_view_has_selected_headers (ModestHeaderView *self) { GtkTreeSelection *sel; gboolean empty; - - g_return_val_if_fail (self, FALSE); + + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE); /* Get selection object and check selected rows count */ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); @@ -705,7 +747,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self) GtkTreeModel *tree_model = NULL; GtkTreeIter iter; - g_return_val_if_fail (self, NULL); + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -779,6 +821,8 @@ modest_header_view_select_next (ModestHeaderView *self) GtkTreeModel *model; GtkTreePath *path; + g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); path = get_selected_row (GTK_TREE_VIEW(self), &model); if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) { @@ -803,6 +847,8 @@ modest_header_view_select_prev (ModestHeaderView *self) GtkTreeModel *model; GtkTreePath *path; + g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); path = get_selected_row (GTK_TREE_VIEW(self), &model); if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) { @@ -824,8 +870,9 @@ modest_header_view_select_prev (ModestHeaderView *self) GList* modest_header_view_get_columns (ModestHeaderView *self) -{ - g_return_val_if_fail (self, FALSE); +{ + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL); + return gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); } @@ -839,10 +886,10 @@ modest_header_view_set_style (ModestHeaderView *self, gboolean show_col_headers = FALSE; ModestHeaderViewStyle old_style; - g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE); g_return_val_if_fail (style >= 0 && MODEST_HEADER_VIEW_STYLE_NUM, FALSE); - + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); if (priv->style == style) return TRUE; /* nothing to do */ @@ -869,7 +916,8 @@ modest_header_view_set_style (ModestHeaderView *self, ModestHeaderViewStyle modest_header_view_get_style (ModestHeaderView *self) { - g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), FALSE); + return MODEST_HEADER_VIEW_GET_PRIVATE(self)->style; } @@ -885,48 +933,31 @@ modest_header_view_on_expose_event(GtkTreeView *header_view, 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); + if (!model) + return FALSE; + 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)) + 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 - * gtk_tree_view_set_model - */ -static void -modest_header_view_set_model (GtkTreeView *header_view, GtkTreeModel *model) -{ -/* GtkTreeModel *old_model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); */ -/* if (old_model_sort && GTK_IS_TREE_MODEL_SORT (old_model_sort)) { */ -/* GtkTreeModel *old_model; */ -/* ModestHeaderViewPrivate *priv; */ -/* priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view); */ -/* old_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (old_model_sort)); */ - -/* /\* Set new model *\/ */ -/* gtk_tree_view_set_model (header_view, model); */ -/* } else */ - gtk_tree_view_set_model (header_view, model); -} - TnyFolder* modest_header_view_get_folder (ModestHeaderView *self) { ModestHeaderViewPrivate *priv; + + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); if (priv->folder) @@ -936,22 +967,19 @@ modest_header_view_get_folder (ModestHeaderView *self) } static void -modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) +set_folder_intern_get_headers_async_cb (TnyFolder *folder, + gboolean cancelled, + TnyList *headers, + GError *err, + gpointer user_data) { - TnyFolderType type; - TnyList *headers; + ModestHeaderView *self; ModestHeaderViewPrivate *priv; - GList *cols, *cursor; - GtkTreeModel *filter_model, *sortable; - guint sort_colid; - GtkSortType sort_type; - - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - headers = TNY_LIST (tny_gtk_header_list_model_new ()); + g_return_if_fail (MODEST_IS_HEADER_VIEW (user_data)); - tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers), - folder, FALSE); + self = MODEST_HEADER_VIEW (user_data); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); /* Add IDLE observer (monitor) and another folder observer for new messages (self) */ @@ -964,6 +992,39 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers)); tny_folder_monitor_start (priv->monitor); g_mutex_unlock (priv->observers_lock); +} + +static void +modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) +{ + TnyFolderType type; + TnyList *headers; + ModestHeaderViewPrivate *priv; + GList *cols, *cursor; + GtkTreeModel *filter_model, *sortable; + guint sort_colid; + GtkSortType sort_type; + + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + headers = TNY_LIST (tny_gtk_header_list_model_new ()); + + /* Start the monitor in the callback of the + tny_gtk_header_list_model_set_folder call. It's crucial to + do it there and not just after the call because we want the + monitor to observe only the headers returned by the + tny_folder_get_headers_async call that it's inside the + tny_gtk_header_list_model_set_folder call. This way the + monitor infrastructure could successfully cope with + duplicates. For example if a tny_folder_add_msg_async is + happening while tny_gtk_header_list_model_set_folder is + invoked, then the first call could add a header that will + be added again by tny_gtk_header_list_model_set_folder, so + we'd end up with duplicate headers. sergio */ + tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers), + folder, FALSE, + set_folder_intern_get_headers_async_cb, + NULL, self); sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers)); g_object_unref (G_OBJECT (headers)); @@ -985,6 +1046,9 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) /* Restore sort column id */ if (cols) { type = modest_tny_folder_guess_folder_type (folder); + if (type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + sort_colid = modest_header_view_get_sort_column_id (self, type); sort_type = modest_header_view_get_sort_type (self, type); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), @@ -1001,12 +1065,10 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) } /* Set new model */ - modest_header_view_set_model (GTK_TREE_VIEW (self), filter_model); + gtk_tree_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)); */ /* Free */ g_list_free (cols); @@ -1021,6 +1083,9 @@ modest_header_view_sort_by_column_id (ModestHeaderView *self, GtkTreeModel *tree_filter, *sortable = NULL; TnyFolderType type; + g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); + g_return_if_fail (sort_type == GTK_SORT_ASCENDING || sort_type == GTK_SORT_DESCENDING); + /* Get model and private data */ priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); @@ -1029,16 +1094,15 @@ modest_header_view_sort_by_column_id (ModestHeaderView *self, /* Sort tree model */ type = modest_tny_folder_guess_folder_type (priv->folder); - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), + if (type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + else { + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), sort_colid, sort_type); - /* Store new sort parameters */ - modest_header_view_set_sort_params (self, sort_colid, sort_type, type); - - /* Save GConf parameters */ -/* modest_widget_memory_save (modest_runtime_get_conf(), */ -/* G_OBJECT(self), "header-view"); */ - + /* Store new sort parameters */ + modest_header_view_set_sort_params (self, sort_colid, sort_type, type); + } } void @@ -1049,7 +1113,11 @@ modest_header_view_set_sort_params (ModestHeaderView *self, { ModestHeaderViewPrivate *priv; ModestHeaderViewStyle style; - + + g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); + g_return_if_fail (sort_type == GTK_SORT_ASCENDING || sort_type == GTK_SORT_DESCENDING); + g_return_if_fail (type != TNY_FOLDER_TYPE_INVALID); + style = modest_header_view_get_style (self); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -1064,6 +1132,9 @@ modest_header_view_get_sort_column_id (ModestHeaderView *self, ModestHeaderViewPrivate *priv; ModestHeaderViewStyle style; + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), 0); + g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, 0); + style = modest_header_view_get_style (self); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -1076,7 +1147,10 @@ modest_header_view_get_sort_type (ModestHeaderView *self, { ModestHeaderViewPrivate *priv; ModestHeaderViewStyle style; - + + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), GTK_SORT_DESCENDING); + g_return_val_if_fail (type != TNY_FOLDER_TYPE_INVALID, GTK_SORT_DESCENDING); + style = modest_header_view_get_style (self); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); @@ -1113,10 +1187,41 @@ 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); + + /* Allow filtering notifications from now on if the current + folder is still the same (if not then the user has selected + another one to refresh, we should wait until that refresh + finishes) */ + if (priv->folder == folder) + priv->notify_status = TRUE; + /* Frees */ + g_object_unref (info->header_view); g_free (info); } +static void +refresh_folder_error_handler (ModestMailOperation *mail_op, + gpointer user_data) +{ + const GError *error = modest_mail_operation_get_error (mail_op); + + if (error->code == TNY_SYSTEM_ERROR_MEMORY || + error->code == TNY_IO_ERROR_WRITE || + error->code == TNY_IO_ERROR_READ) { + ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op); + /* If the mail op has been cancelled then it's not an error: don't show any message */ + if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) { + modest_platform_information_banner (NULL, NULL, + dgettext("ke-recv", + "cerm_device_memory_full")); + } + } +} + void modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder, @@ -1124,13 +1229,26 @@ modest_header_view_set_folder (ModestHeaderView *self, gpointer user_data) { ModestHeaderViewPrivate *priv; - ModestWindowMgr *mgr = NULL; - GObject *source = NULL; SetFolderHelper *info; - - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + ModestWindow *main_win; + + g_return_if_fail (self); + + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), + FALSE); /* don't create */ + if (!main_win) { + g_warning ("%s: BUG: no main window", __FUNCTION__); + return; + } + if (priv->folder) { + if (priv->status_timeout) { + g_source_remove (priv->status_timeout); + priv->status_timeout = 0; + } + g_mutex_lock (priv->observers_lock); tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (self)); g_object_unref (priv->folder); @@ -1142,29 +1260,34 @@ modest_header_view_set_folder (ModestHeaderView *self, ModestMailOperation *mail_op = NULL; GtkTreeSelection *selection; - /* Get main window to use it as source of mail operation */ - mgr = modest_runtime_get_window_mgr (); - source = G_OBJECT (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ())); - /* Set folder in the model */ modest_header_view_set_folder_intern (self, folder); - + /* Pick my reference. Nothing to do with the mail operation */ priv->folder = g_object_ref (folder); + /* Do not notify about filterings until the refresh finishes */ + priv->notify_status = FALSE; + /* 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->header_view = g_object_ref (self); info->cb = callback; info->user_data = user_data; /* 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_with_error_handling (G_OBJECT(main_win), + refresh_folder_error_handler, + NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -1184,11 +1307,15 @@ modest_header_view_set_folder (ModestHeaderView *self, g_object_unref (G_OBJECT (priv->monitor)); priv->monitor = NULL; } - modest_header_view_set_model (GTK_TREE_VIEW (self), NULL); + gtk_tree_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); } } @@ -1218,7 +1345,12 @@ on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path, /* Dont open DELETED messages */ if (flags & TNY_HEADER_FLAG_DELETED) { - modest_platform_information_banner (NULL, NULL, _("mcen_ib_message_already_deleted")); + GtkWidget *win; + gchar *msg; + win = gtk_widget_get_ancestor (GTK_WIDGET (treeview), GTK_TYPE_WINDOW); + msg = modest_ui_actions_get_msg_already_deleted_error_msg (MODEST_WINDOW (win)); + modest_platform_information_banner (NULL, NULL, msg); + g_free (msg); goto frees; } @@ -1283,20 +1415,32 @@ _modest_header_view_change_selection (GtkTreeSelection *selection, gpointer user_data) { g_return_if_fail (GTK_IS_TREE_SELECTION (selection)); - g_return_if_fail (MODEST_IS_HEADER_VIEW (user_data)); - + g_return_if_fail (user_data && MODEST_IS_HEADER_VIEW (user_data)); + on_selection_changed (selection, user_data); } -static gint compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2) +static gint +compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2) { - p1 = p1 & TNY_HEADER_FLAG_PRIORITY; - p2 = p2 & TNY_HEADER_FLAG_PRIORITY; - if (p1 == 0) - p1 = TNY_HEADER_FLAG_LOW_PRIORITY + 1; - if (p2 == 0) - p2 = TNY_HEADER_FLAG_LOW_PRIORITY + 1; - return p1 - p2; + /* HH, LL, NN */ + if (p1 == p2) + return 0; + + /* HL HN */ + if (p1 == TNY_HEADER_FLAG_HIGH_PRIORITY) + return 1; + + /* LH LN */ + if (p1 == TNY_HEADER_FLAG_LOW_PRIORITY) + return -1; + + /* NH */ + if ((p1 == TNY_HEADER_FLAG_NORMAL_PRIORITY) && (p2 == TNY_HEADER_FLAG_HIGH_PRIORITY)) + return -1; + + /* NL */ + return 1; } static gint @@ -1327,18 +1471,28 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, return cmp ? cmp : t1 - t2; - case TNY_HEADER_FLAG_PRIORITY: - gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1, + case TNY_HEADER_FLAG_PRIORITY_MASK: { + TnyHeader *header1 = NULL, *header2 = NULL; + + gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header1, TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,-1); - gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2, + gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header2, TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,-1); /* This is for making priority values respect the intuitive sort relationship - * as HIGH is 11, LOW is 01, and we put NORMAL AS 10 (2) */ - cmp = compare_priorities (val1, val2); + * as HIGH is 01, LOW is 10, and NORMAL is 00 */ - return cmp ? cmp : t1 - t2; + if (header1 && header2) { + cmp = compare_priorities (tny_header_get_priority (header1), + tny_header_get_priority (header2)); + g_object_unref (header1); + g_object_unref (header2); + + return cmp ? cmp : t1 - t2; + } + return t1 - t2; + } default: return &iter1 - &iter2; /* oughhhh */ } @@ -1370,65 +1524,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 = NULL; - 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); - /* 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); + /* 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); +} - gtk_tree_path_free (source_row); -#endif +/** + * 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; + + self = MODEST_HEADER_VIEW (widget); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + 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 * @@ -1527,48 +1724,86 @@ 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; + enable_drag_and_drop(self); + return FALSE; +} - 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); +static gboolean +on_button_press_event(GtkWidget * self, GdkEventButton * event, gpointer userdata) +{ + GtkTreeSelection *selection = NULL; + GtkTreePath *path = NULL; + gboolean already_selected = FALSE, already_opened = FALSE; + ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN; - folder = tny_folder_change_get_folder (helper->change); + if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(self), event->x, event->y, &path, NULL, NULL, NULL)) { + GtkTreeIter iter; + GtkTreeModel *model; - priv = MODEST_HEADER_VIEW_GET_PRIVATE (helper->self); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); + already_selected = gtk_tree_selection_path_is_selected (selection, path); + + /* Get header from model */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (gtk_tree_model_get_iter (model, &iter, path)) { + GValue value = {0,}; + TnyHeader *header; + + gtk_tree_model_get_value (model, &iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + &value); + header = (TnyHeader *) g_value_get_object (&value); + if (TNY_IS_HEADER (header)) { + status = modest_tny_all_send_queues_get_msg_status (header); + already_opened = modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr (), + header, NULL); + } + g_value_unset (&value); + } + } - g_mutex_lock (priv->observers_lock); + /* Enable drag and drop only if the user clicks on a row that + it's already selected. If not, let him select items using + the pointer. If the message is in an OUTBOX and in sending + status disable drag and drop as well */ + if (!already_selected || + status == MODEST_TNY_SEND_QUEUE_SENDING || + already_opened) + 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; + /* If it's already opened then do not let the button-press + event go on because it'll perform a message open because + we're clicking on to an already selected header */ + return (already_opened) ? TRUE : FALSE; } static void @@ -1577,7 +1812,7 @@ folder_monitor_update (TnyFolderObserver *self, { ModestHeaderViewPrivate *priv = NULL; TnyFolderChangeChanged changed; - HeadersCountChangedHelper *helper = NULL; + TnyFolder *folder = NULL; changed = tny_folder_change_get_changed (change); @@ -1585,37 +1820,66 @@ 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; + + MODEST_DEBUG_BLOCK ( + if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) + g_print ("ADDED %d/%d (r/t) \n", + tny_folder_change_get_new_unread_count (change), + tny_folder_change_get_new_all_count (change)); + if (changed & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT) + g_print ("ALL COUNT %d\n", + tny_folder_change_get_new_all_count (change)); + if (changed & TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT) + g_print ("UNREAD COUNT %d\n", + tny_folder_change_get_new_unread_count (change)); + if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) + g_print ("EXPUNGED %d/%d (r/t) \n", + tny_folder_change_get_new_unread_count (change), + tny_folder_change_get_new_all_count (change)); + if (changed & TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME) + g_print ("FOLDER RENAME\n"); + if (changed & TNY_FOLDER_CHANGE_CHANGED_MSG_RECEIVED) + g_print ("MSG RECEIVED %d/%d (r/t) \n", + tny_folder_change_get_new_unread_count (change), + tny_folder_change_get_new_all_count (change)); + g_print ("---------------------------------------------------\n"); + ); /* 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); - - idle_notify_headers_count_changed (helper); - idle_notify_headers_count_changed_destroy (helper); - -/* I changed this because it's not necessary anymore: all updates of - * observers in Tinymail happen guaranteed on the Mainloop already. - * Your friend, Philip - * - * g_idle_add_full (G_PRIORITY_DEFAULT, - * idle_notify_headers_count_changed, - * helper, - * idle_notify_headers_count_changed_destroy); - */ + 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); + + /* 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; - + ModestHeaderViewPrivate *priv; + + g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), TRUE); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (self)); return priv->status == HEADER_VIEW_EMPTY; @@ -1624,12 +1888,16 @@ modest_header_view_is_empty (ModestHeaderView *self) void modest_header_view_clear (ModestHeaderView *self) { + g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self)); + modest_header_view_set_folder (self, NULL, NULL, NULL); } void modest_header_view_copy_selection (ModestHeaderView *header_view) { + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view)); + /* Copy selection */ _clipboard_set_selected_data (header_view, FALSE); } @@ -1641,7 +1909,8 @@ modest_header_view_cut_selection (ModestHeaderView *header_view) const gchar **hidding = NULL; guint i, n_selected; - g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW (header_view)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view); /* Copy selection */ @@ -1685,7 +1954,36 @@ _clipboard_set_selected_data (ModestHeaderView *header_view, g_object_unref (headers); } +typedef struct { + ModestHeaderView *self; + TnyFolder *folder; +} NotifyFilterInfo; + +static gboolean +notify_filter_change (gpointer data) +{ + NotifyFilterInfo *info = (NotifyFilterInfo *) data; + + g_signal_emit (info->self, + signals[MSG_COUNT_CHANGED_SIGNAL], + 0, info->folder, NULL); + + return FALSE; +} + +static void +notify_filter_change_destroy (gpointer data) +{ + NotifyFilterInfo *info = (NotifyFilterInfo *) data; + ModestHeaderViewPrivate *priv; + priv = MODEST_HEADER_VIEW_GET_PRIVATE (info->self); + priv->status_timeout = 0; + + g_object_unref (info->self); + g_object_unref (info->folder); + g_slice_free (NotifyFilterInfo, info); +} static gboolean filter_row (GtkTreeModel *model, @@ -1699,18 +1997,23 @@ filter_row (GtkTreeModel *model, gchar *id = NULL; gboolean visible = TRUE; gboolean found = FALSE; - + GValue value = {0,}; + HeaderViewStatus old_status; + g_return_val_if_fail (MODEST_IS_HEADER_VIEW (user_data), FALSE); priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data); /* 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); + gtk_tree_model_get_value (model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &value); + flags = (TnyHeaderFlags) g_value_get_int (&value); + g_value_unset (&value); + gtk_tree_model_get_value (model, iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &value); + header = (TnyHeader *) g_value_get_object (&value); + g_value_unset (&value); - /* Hide mark as deleted heders */ - if (flags & TNY_HEADER_FLAG_DELETED) { + /* Hide deleted and mark as deleted heders */ + if (flags & TNY_HEADER_FLAG_DELETED || + flags & TNY_HEADER_FLAG_EXPUNGED) { visible = FALSE; goto frees; } @@ -1722,25 +2025,39 @@ filter_row (GtkTreeModel *model, } /* Get message id from header (ensure is a valid id) */ - if (!header) return FALSE; - id = g_strdup(tny_header_get_message_id (header)); + if (!header) { + visible = FALSE; + goto frees; + } /* Check hiding */ if (priv->hidding_ids != NULL) { + id = tny_header_dup_message_id (header); 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; + g_free(id); } frees: + old_status = priv->status; priv->status = ((gboolean) priv->status) && !visible; - - /* Free */ - if (header) - g_object_unref (header); - g_free(id); + if ((priv->notify_status) && (priv->status != old_status)) { + NotifyFilterInfo *info; + + if (priv->status_timeout) + g_source_remove (priv->status_timeout); + + info = g_slice_new0 (NotifyFilterInfo); + info->self = g_object_ref (G_OBJECT (user_data)); + info->folder = tny_header_get_folder (header); + priv->status_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000, + notify_filter_change, + info, + notify_filter_change_destroy); + } return visible; } @@ -1767,15 +2084,15 @@ modest_header_view_refilter (ModestHeaderView *header_view) GtkTreeModel *model = NULL; ModestHeaderViewPrivate *priv = NULL; - g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); + g_return_if_fail (header_view && 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)); - if (GTK_IS_TREE_MODEL_FILTER (model)) + if (GTK_IS_TREE_MODEL_FILTER (model)) { + priv->status = HEADER_VIEW_INIT; gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); + } } /* @@ -1793,8 +2110,6 @@ on_account_removed (TnyAccountStore *self, if (TNY_IS_TRANSPORT_ACCOUNT (account)) return; - g_print ("--------------------- HEADER ---------------\n"); - priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data); if (priv->folder) { @@ -1803,19 +2118,18 @@ on_account_removed (TnyAccountStore *self, 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); + g_object_unref (my_account); } } -void modest_header_view_add_observer( - ModestHeaderView *header_view, - ModestHeaderViewObserver *observer) +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)); + ModestHeaderViewPrivate *priv; + + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view)); + g_return_if_fail (observer && MODEST_IS_HEADER_VIEW_OBSERVER(observer)); priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view); @@ -1824,15 +2138,14 @@ void modest_header_view_add_observer( g_mutex_unlock(priv->observer_list_lock); } -void modest_header_view_remove_observer( - ModestHeaderView *header_view, - ModestHeaderViewObserver *observer) +void +modest_header_view_remove_observer(ModestHeaderView *header_view, + ModestHeaderViewObserver *observer) { - ModestHeaderViewPrivate *priv = NULL; + ModestHeaderViewPrivate *priv; - g_assert(MODEST_IS_HEADER_VIEW(header_view)); - g_assert(observer != NULL); - g_assert(MODEST_IS_HEADER_VIEW_OBSERVER(observer)); + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view)); + g_return_if_fail (observer && MODEST_IS_HEADER_VIEW_OBSERVER(observer)); priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view); @@ -1841,17 +2154,18 @@ void modest_header_view_remove_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) +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)); + g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW(header_view)); + priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view); g_mutex_lock(priv->observer_list_lock);