2007-06-06 Murray Cumming <murrayc@murrayc.com>

* 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

diff --git a/ChangeLog2 b/ChangeLog2
index 5517d40..ce66d5b 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,4 +1,10 @@
-2007-06-06  Murray Cumming  <murrayc@murrayc.come>
+2007-06-06  Murray Cumming  <murrayc@murrayc.com>
+
+       * 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  <murrayc@murrayc.com>
 
        * 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 (file)
--- 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;