+
+ /* auth mechanism */
+ key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_AUTH_MECH, TRUE);
+ ok = modest_conf_set_string (priv->modest_conf, key,
+ modest_protocol_info_get_auth_protocol_name (auth),
+ &err);
+ if (err) {
+ g_printerr ("modest: failed to set %s: %s\n", key, err->message);
+ g_error_free (err);
+ ok = FALSE;
+ }
+ g_free (key);
+ if (!ok)
+ goto cleanup;
+
+ /* Add the security settings: */
+ modest_server_account_set_security (self, name, security);
+
+cleanup:
+ if (!ok) {
+ g_printerr ("modest: failed to add server account\n");
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+/** modest_account_mgr_add_server_account_uri:
+ * Only used for mbox and maildir accounts.
+ */
+gboolean
+modest_account_mgr_add_server_account_uri (ModestAccountMgr * self,
+ const gchar *name, ModestTransportStoreProtocol proto,
+ const gchar *uri)
+{
+ ModestAccountMgrPrivate *priv;
+ gchar *key;
+ gboolean ok;
+
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
+ g_return_val_if_fail (name, FALSE);
+ g_return_val_if_fail (strchr(name, '/') == NULL, FALSE);
+ g_return_val_if_fail (uri, FALSE);
+
+ priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+
+