+2007-07-13 MMurray Cumming <murrayc@murrayc.com>
+
+ * src/modest-account-mgr.c: (modest_account_mgr_account_names):
+ Ignore modest accounts whose server accounts don't exist in gconf.
+ This prevents us trying to create TnyAccount instances for those
+ server accounts when the server account has been removed from gconf,
+ but the parent modest account has not yet been removed from modest.
+ I don't know why this is only noticeable now. It was probably just
+ a harmeless g_warning() anyway.
+
2007-07-13 Murray Cumming <murrayc@murrayc.com>
* src/modest-ui-dimming-rules.c: (_selected_folder_is_root):
}
}
+ /* Ignore modest accounts whose server accounts don't exist:
+ * (We could be getting this list while the account is being deleted,
+ * while the child server accounts have already been deleted, but the
+ * parent modest account already exists.
+ */
+ if (add) {
+ gchar* server_account_name = modest_account_mgr_get_string (self, account_name_key, MODEST_ACCOUNT_STORE_ACCOUNT,
+ FALSE);
+ if (server_account_name) {
+ if (!modest_account_mgr_account_exists (self, server_account_name, TRUE))
+ add = FALSE;
+ g_free (server_account_name);
+ }
+ }
+
+ if (add) {
+ gchar* server_account_name = modest_account_mgr_get_string (self, account_name_key, MODEST_ACCOUNT_TRANSPORT_ACCOUNT,
+ FALSE);
+ if (server_account_name) {
+ if (!modest_account_mgr_account_exists (self, server_account_name, TRUE))
+ add = FALSE;
+ g_free (server_account_name);
+ }
+ }
+
if (add)
result = g_slist_append (result, unescaped_name);
else