* src/modest-mail-operation.c:

	* (modest_mail_operation_cancel): a mail operation without an
	  account is a not expected status, so we show a warning for
	  this.

pmo-trunk-r2799

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 9780168..47eae74 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -417,8 +417,8 @@ modest_mail_operation_cancel (ModestMailOperation *self)
        /* Cancel the mail operation. We need to wrap it between this
           start/stop operations to allow following calls to the
           account */
-       if (priv->account)
-               tny_account_cancel (priv->account);
+       g_return_val_if_fail (priv->account, FALSE);
+       tny_account_cancel (priv->account);
 
        return canceled;
 }