* modest-mail-operation.c:

[modest] / src / modest-mail-operation.c

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 8c23dd6..bd6bc9c 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -562,8 +562,8 @@ modest_mail_operation_update_account (ModestMailOperation *mail_op,
        TnyList *folders;
        TnyFolderStoreQuery *query;
 
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op));
-       g_return_if_fail (TNY_IS_STORE_ACCOUNT(store_account));
+       g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), FALSE);
+       g_return_val_if_fail (TNY_IS_STORE_ACCOUNT(store_account), FALSE);
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op);
 
@@ -808,6 +808,9 @@ modest_mail_operation_xfer_folder (ModestMailOperation *mail_op,
        g_object_unref (G_OBJECT (iter));
 }
 
+
+/* FIXME: this method should be rewritten when the policy for the
+   Trash folder becomes clearer */
 static TnyFolder *
 modest_mail_operation_find_trash_folder (ModestMailOperation *mail_op,
                                         TnyStoreAccount *store_account)