#include <tny-simple-list.h>
#include <tny-folder-monitor.h>
#include <tny-folder-change.h>
+#include <tny-error.h>
#include <string.h>
#include <modest-header-view.h>
#include <modest-header-view-priv.h>
#include <modest-dnd.h>
#include <modest-tny-folder.h>
-
+#include <modest-debug.h>
#include <modest-main-window.h>
-
+#include <modest-ui-actions.h>
#include <modest-marshal.h>
#include <modest-text-utils.h>
#include <modest-icon-names.h>
gulong selection_changed_handler;
gulong acc_removed_handler;
- HeaderViewStatus status;
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;
static void
tny_folder_observer_init (TnyFolderObserverIface *klass)
{
- klass->update_func = folder_monitor_update;
+ klass->update = folder_monitor_update;
}
static GtkTreeViewColumn*
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);
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),
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;
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));
{
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));
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);
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))) {
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))) {
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));
}
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 */
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;
}
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)) {
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)
}
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, NULL, NULL, NULL);
+ 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) */
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));
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));
{
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);
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);
{
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);
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,
}
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);
/* 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);
/* 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 (G_OBJECT(main_win));
+ 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);
/* 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;
}
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)
{
-
/* HH, LL, NN */
if (p1 == p2)
return 0;
/* NL */
return 1;
-
}
static gint
GtkTreeSelection *selection = NULL;
GtkTreePath *path = NULL;
gboolean already_selected = FALSE;
+ ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(self), event->x, event->y, &path, NULL, NULL, NULL)) {
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+
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);
+ g_value_unset (&value);
+ }
}
/* 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) {
+ the pointer. If the message is in an outbos and in sending
+ status disable drag and drop as well */
+ if (!already_selected || status == MODEST_TNY_SEND_QUEUE_SENDING)
disable_drag_and_drop(self);
- }
- if (path != NULL) {
+ if (path != NULL)
gtk_tree_path_free(path);
- }
return FALSE;
}
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)) {
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;
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);
}
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 */
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,
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;
}
}
/* 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;
}
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);
-
+
/* Hide cut headers */
model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
if (GTK_IS_TREE_MODEL_FILTER (model)) {
- priv->status = 0;
+ priv->status = HEADER_VIEW_INIT;
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
}
}
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);
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);
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);
projects / modest / blobdiff