modest_account_mgr_add_account (ModestAccountMgr *self,
const gchar *name,
const gchar *store_account,
- const gchar *transport_account)
+ const gchar *transport_account,
+ gboolean enabled)
{
ModestAccountMgrPrivate *priv;
gchar *key;
return FALSE;
}
}
- modest_account_mgr_set_enabled (self, name, TRUE);
+ modest_account_mgr_set_enabled (self, name, enabled);
/* if no default account has been defined yet, do so now */
default_account = modest_account_mgr_get_default_account (self);
/* Add the security settings: */
- modest_server_account_set_option_security (self, name, security);
+ modest_server_account_set_security (self, name, security);
}
cleanup:
g_printerr ("modest: error removing key: %s\n", err->message);
g_error_free (err);
}
+
+ /* If this was the default, then remove that setting: */
+ if (!server_account) {
+ gchar *default_account_name = modest_account_mgr_get_default_account (self);
+ if (default_account_name && (strcmp (default_account_name, name) == 0))
+ modest_account_mgr_unset_default_account (self);
+ g_free (default_account_name);
+ }
return retval;
}
GSList*
-modest_account_mgr_account_names (ModestAccountMgr * self)
+modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled)
{
GSList *accounts;
ModestAccountMgrPrivate *priv;
}
strip_prefix_from_elements (accounts, prefix_len);
- return accounts;
+
+ GSList *result = NULL;
+
+ /* Filter-out the disabled accounts if requested: */
+ if (only_enabled) {
+ GSList *iter = accounts;
+ while (iter) {
+ if (!(iter->data))
+ continue;
+
+ const gchar* account_name = (const gchar*)iter->data;
+ if (account_name && modest_account_mgr_get_enabled (self, account_name))
+ result = g_slist_append (result, g_strdup (account_name));
+
+ iter = g_slist_next (iter);
+ }
+
+ /* TODO: Free the strings too? */
+ g_slist_free (accounts);
+ accounts = NULL;
+ }
+ else
+ result = accounts;
+
+
+ return result;
}
GSList *account_names = NULL;
GSList *cursor = NULL;
- cursor = account_names = modest_account_mgr_account_names (self);
+ cursor = account_names = modest_account_mgr_account_names (self,
+ TRUE /* enabled accounts, because disabled accounts are not user visible. */);
gboolean found = FALSE;