From b977b54e2febcb4cb767dcf5e26a273f86e7b5db Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Mon, 18 Jun 2007 05:17:37 +0000 Subject: ** Fix for bug #437935 from Gilles Dartiguelongue svn path=/trunk/; revision=33698 --- mail/ChangeLog | 6 ++++++ mail/em-folder-tree-model.c | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 25f01863e2..7d4f844659 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2007-06-18 Srinivasa Ragavan + + ** Fix for bug #437935 from Gilles Dartiguelongue + + * em-folder-tree-model.c: (em_folder_tree_model_is_type_inbox): + 2007-06-18 Srinivasa Ragavan ** Fix for bug #443659 from Vinod diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 5e4a5b2b02..72d86beac2 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -1117,26 +1117,26 @@ em_folder_tree_model_is_type_inbox (EMFolderTreeModel *model, CamelStore *store, GtkTreeIter iter; guint32 flags; - g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model)); - g_return_if_fail (CAMEL_IS_STORE (store)); - g_return_if_fail (full != NULL); + g_return_val_if_fail (EM_IS_FOLDER_TREE_MODEL (model), FALSE); + g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE); + g_return_val_if_fail (full != NULL, FALSE); u(printf("Checking if the folder is an INBOX type %p '%s' %d\n", store, full, unread)); if (!(si = g_hash_table_lookup (model->store_hash, store))) { u(printf(" can't find store\n")); - return; + return FALSE; } if (!(row = g_hash_table_lookup (si->full_hash, full))) { u(printf(" can't find row\n")); - return; + return FALSE; } tree_path = gtk_tree_row_reference_get_path (row); if (!gtk_tree_model_get_iter ((GtkTreeModel *) model, &iter, tree_path)) { gtk_tree_path_free (tree_path); - return; + return FALSE; } gtk_tree_path_free (tree_path); -- cgit