From 4a7aa689a2c8988ede2809db007e297b05adce7c Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 20 Nov 2007 17:26:32 +0000 Subject: [PATCH] * add retval check (coverity) pmo-trunk-r3784 --- src/modest-mail-operation.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 315cf74..d07bbcb 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -1764,16 +1764,17 @@ modest_mail_operation_remove_folder (ModestMailOperation *self, } } else { TnyFolderStore *parent = tny_folder_get_folder_store (folder); + if (parent) { + modest_mail_operation_notify_start (self); + tny_folder_store_remove_folder (parent, folder, &(priv->error)); + CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED); + + if (!priv->error) + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - modest_mail_operation_notify_start (self); - tny_folder_store_remove_folder (parent, folder, &(priv->error)); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED); - - if (!priv->error) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - - if (parent) - g_object_unref (G_OBJECT (parent)); + g_object_unref (parent); + } else + g_warning ("%s: could not get parent folder", __FUNCTION__); } g_object_unref (G_OBJECT (account)); -- 1.7.9.5