From 5b4a79403dc6d9053eaa0ef225b8ff529bef9bbe Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Wed, 6 Jun 2007 11:24:01 +0000 Subject: [PATCH] 2007-06-06 Murray Cumming * src/modest-account-mgr-helpers.c: (modest_account_mgr_get_default_account): Do not check that the account exists if there is no default account (NULL), to fix a runtime warning. pmo-trunk-r2078 --- ChangeLog2 | 8 +++++++- src/modest-account-mgr-helpers.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog2 b/ChangeLog2 index 5517d40..ce66d5b 100644 --- a/ChangeLog2 +++ b/ChangeLog2 @@ -1,4 +1,10 @@ -2007-06-06 Murray Cumming +2007-06-06 Murray Cumming + + * src/modest-account-mgr-helpers.c: + (modest_account_mgr_get_default_account): Do not check that the account + exists if there is no default account (NULL), to fix a runtime warning. + +2007-06-06 Murray Cumming * src/widgets/modest-folder-view.c: (update_model): Do not unref the treemodel before we have finished with it. diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c index 08e0f5b..5de9195 100644 --- a/src/modest-account-mgr-helpers.c +++ b/src/modest-account-mgr-helpers.c @@ -533,7 +533,7 @@ modest_account_mgr_get_default_account (ModestAccountMgr *self) } /* sanity check */ - if (!modest_account_mgr_account_exists (self, account, FALSE)) { + if (account && !modest_account_mgr_account_exists (self, account, FALSE)) { g_printerr ("modest: default account does not exist\n"); g_free (account); return NULL; -- 1.7.9.5