static void
on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpointer user_data)
{
- ModestAccountMgr *self;
- ModestAccountMgrPrivate *priv;
-
- gchar *account;
- gboolean is_account_key, is_server_account;
- gboolean enabled;
-
- self = MODEST_ACCOUNT_MGR (user_data);
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+ /* printf("DEBUG: %s: key=%s\n", __FUNCTION__, key); */
+
+ ModestAccountMgr *self = MODEST_ACCOUNT_MGR (user_data);
+ /* ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); */
+
+ /* there is only one not-really-account key which will still emit
+ * a signal: a change in MODEST_CONF_DEFAULT_ACCOUNT */
+ if (key && strcmp (key, MODEST_CONF_DEFAULT_ACCOUNT) == 0) {
+ gchar *default_account =
+ modest_account_mgr_get_default_account (self);
+ g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0,
+ default_account, key, FALSE);
+ g_free (default_account);
+ return;
+ }
+
+ gboolean is_account_key = FALSE;
+ gboolean is_server_account = FALSE;
+ gchar* account = _modest_account_mgr_account_from_key (key, &is_account_key, &is_server_account);
- account = _modest_account_mgr_account_from_key (key, &is_account_key, &is_server_account);
-
/* if this is not an account-related key change, ignore */
if (!account)
return;
}
/* is this account enabled? */
+ gboolean enabled = FALSE;
if (is_server_account)
enabled = TRUE;
else
- enabled = modest_account_mgr_account_get_enabled (self, account);
+ enabled = modest_account_mgr_get_enabled (self, account);
- /* account was changed.
- * and always notify when enabled/disabled changes
+ /* Notify is server account was changed, default account was changed
+ * or when enabled/disabled changes:
*/
- if (enabled || g_str_has_suffix (key, MODEST_ACCOUNT_ENABLED))
+ if (enabled ||
+ g_str_has_suffix (key, MODEST_ACCOUNT_ENABLED) ||
+ strcmp (key, MODEST_CONF_DEFAULT_ACCOUNT) == 0)
g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0,
account, key, is_server_account);
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
+
ModestAccountMgr *
-modest_account_mgr_new (ModestConf * conf)
+modest_account_mgr_new (ModestConf *conf)
{
GObject *obj;
ModestAccountMgrPrivate *priv;
const gchar *name,
const gchar *store_account,
const gchar *transport_account,
- GError **err)
+ gboolean enabled)
{
ModestAccountMgrPrivate *priv;
gchar *key;
gboolean ok;
-
- g_return_val_if_fail (self, FALSE);
+ gchar *default_account;
+ GError *err = NULL;
+
+ 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);
* and in that the 'display_name' string key
*/
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME, FALSE);
- if (modest_account_mgr_account_exists (self, key, FALSE, err)) {
+ if (modest_account_mgr_account_exists (self, key, FALSE)) {
g_printerr ("modest: account already exists\n");
g_free (key);
return FALSE;
}
- ok = modest_conf_set_string (priv->modest_conf, key, name, err);
+ ok = modest_conf_set_string (priv->modest_conf, key, name, &err);
g_free (key);
if (!ok) {
g_printerr ("modest: cannot set display name\n");
+ if (err) {
+ g_printerr ("modest: Error adding account conf: %s\n", err->message);
+ g_error_free (err);
+ }
return FALSE;
}
if (store_account) {
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_STORE_ACCOUNT, FALSE);
- ok = modest_conf_set_string (priv->modest_conf, key, store_account, err);
+ ok = modest_conf_set_string (priv->modest_conf, key, store_account, &err);
g_free (key);
if (!ok) {
g_printerr ("modest: failed to set store account '%s'\n",
store_account);
+ if (err) {
+ g_printerr ("modest: Error adding store account conf: %s\n", err->message);
+ g_error_free (err);
+ }
+
return FALSE;
}
}
-
+
if (transport_account) {
- key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, FALSE);
- ok = modest_conf_set_string (priv->modest_conf, key, transport_account, err);
+ key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT,
+ FALSE);
+ ok = modest_conf_set_string (priv->modest_conf, key, transport_account, &err);
g_free (key);
if (!ok) {
g_printerr ("modest: failed to set transport account '%s'\n",
- transport_account);
+ transport_account);
+ if (err) {
+ g_printerr ("modest: Error adding transport account conf: %s\n", err->message);
+ g_error_free (err);
+ }
return FALSE;
}
}
- modest_account_mgr_account_set_enabled (self, name, TRUE);
+ /* Make sure that leave-messages-on-server is enabled by default,
+ * as per the UI spec, though it is only meaningful for accounts using POP.
+ * (possibly this gconf key should be under the server account): */
+ modest_account_mgr_set_bool (self, name,
+ MODEST_ACCOUNT_LEAVE_ON_SERVER, TRUE, FALSE /* not server account */);
+
+
+ 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);
+ if (!default_account)
+ modest_account_mgr_set_default_account (self, name);
+ g_free (default_account);
return TRUE;
}
gboolean
modest_account_mgr_add_server_account (ModestAccountMgr * self,
const gchar * name, const gchar *hostname,
+ guint portnumber,
const gchar * username, const gchar * password,
- ModestProtocol proto)
+ ModestTransportStoreProtocol proto,
+ ModestConnectionProtocol security,
+ ModestAuthProtocol auth)
{
ModestAccountMgrPrivate *priv;
gchar *key;
- ModestProtocolType proto_type;
+ gboolean ok = TRUE;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ 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);
-
- proto_type = modest_protocol_info_get_protocol_type (proto);
- g_return_val_if_fail (proto_type == MODEST_PROTOCOL_TYPE_TRANSPORT ||
- proto_type == MODEST_PROTOCOL_TYPE_STORE, FALSE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
/* hostname */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_HOSTNAME, TRUE);
- if (modest_conf_key_exists (priv->modest_conf, key, NULL)) {
- g_printerr ("modest: server account '%s' already exists", name);
+ if (modest_conf_key_exists (priv->modest_conf, key, &err)) {
+ g_printerr ("modest: server account '%s' already exists\n", name);
g_free (key);
- return FALSE;
+ ok = FALSE;
}
+ if (!ok)
+ goto cleanup;
- modest_conf_set_string (priv->modest_conf, key, null_means_empty(hostname), NULL);
+ modest_conf_set_string (priv->modest_conf, key, null_means_empty(hostname), &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;
+
/* username */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_USERNAME, TRUE);
- modest_conf_set_string (priv->modest_conf, key, null_means_empty (username), NULL);
+ ok = modest_conf_set_string (priv->modest_conf, key, null_means_empty (username), &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;
+
+
/* password */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PASSWORD, TRUE);
- modest_conf_set_string (priv->modest_conf, key, null_means_empty (password), NULL);
+ ok = modest_conf_set_string (priv->modest_conf, key, null_means_empty (password), &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;
/* proto */
key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE);
- modest_conf_set_string (priv->modest_conf, key,
- modest_protocol_info_get_protocol_name(proto),
- NULL);
+ ok = modest_conf_set_string (priv->modest_conf, key,
+ modest_protocol_info_get_transport_store_protocol_name(proto),
+ &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;
+
+
+ /* portnumber */
+ key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PORT, TRUE);
+ ok = modest_conf_set_int (priv->modest_conf, key, portnumber, &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;
+
+
+ /* 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);
+
+
+ /* proto */
+ key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE);
+ ok = modest_conf_set_string (priv->modest_conf, key,
+ modest_protocol_info_get_transport_store_protocol_name(proto),
+ NULL);
+ g_free (key);
+
+ if (!ok) {
+ g_printerr ("modest: failed to set proto\n");
+ return FALSE;
+ }
+
+ /* uri */
+ key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_URI, TRUE);
+ ok = modest_conf_set_string (priv->modest_conf, key, uri, NULL);
+ g_free (key);
+
+ if (!ok) {
+ g_printerr ("modest: failed to set uri\n");
+ return FALSE;
+ }
return TRUE;
}
gboolean
modest_account_mgr_remove_account (ModestAccountMgr * self,
- const gchar * name,
- gboolean server_account,
- GError ** err)
+ const gchar * name, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *key;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
- if (!modest_account_mgr_account_exists (self, name, server_account, err)) {
- g_printerr ("modest: account '%s' does not exist\n", name);
+ if (!modest_account_mgr_account_exists (self, name, server_account)) {
+ g_printerr ("modest: %s: account '%s' does not exist\n", __FUNCTION__, name);
return FALSE;
}
+ /* in case we're not deleting an account, also delete the dependent store and transport account */
+ if (!server_account) {
+ gchar *server_account_name;
+
+ server_account_name = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_STORE_ACCOUNT,
+ FALSE);
+ if (server_account_name) {
+ if (!modest_account_mgr_remove_account (self, server_account_name, TRUE))
+ g_printerr ("modest: failed to remove store account '%s' (%s)\n",
+ server_account_name, name);
+ g_free (server_account_name);
+ } else
+ g_printerr ("modest: could not find the store account for %s\n", name);
+
+ server_account_name = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT,
+ FALSE);
+ if (server_account_name) {
+ if (!modest_account_mgr_remove_account (self, server_account_name, TRUE))
+ g_printerr ("modest: failed to remove transport account '%s' (%s)\n",
+ server_account_name, name);
+ g_free (server_account_name);
+ } else
+ g_printerr ("modest: could not find the transport account for %s\n", name);
+ }
+
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
key = _modest_account_mgr_get_account_keyname (name, NULL, server_account);
+
+ retval = modest_conf_remove_key (priv->modest_conf, key, &err);
+ g_free (key);
- retval = modest_conf_remove_key (priv->modest_conf, key, NULL);
+ if (err) {
+ g_printerr ("modest: error removing key: %s\n", err->message);
+ g_error_free (err);
+ }
- g_free (key);
+ /* 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;
}
}
}
-
+#if 0
+/* Not used. */
GSList*
modest_account_mgr_search_server_accounts (ModestAccountMgr * self,
const gchar * account_name,
- ModestProtocolType type,
- ModestProtocol proto)
+ ModestTransportStoreProtocol proto)
{
GSList *accounts;
GSList *cursor;
GError *err = NULL;
g_return_val_if_fail (self, NULL);
-
- if (proto != MODEST_PROTOCOL_UNKNOWN) {
- ModestProtocolType proto_type;
- proto_type = modest_protocol_info_get_protocol_type (proto);
- g_return_val_if_fail (proto_type == MODEST_PROTOCOL_TYPE_TRANSPORT ||
- proto_type == MODEST_PROTOCOL_TYPE_STORE, NULL);
- }
key = _modest_account_mgr_get_account_keyname (account_name, NULL, TRUE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
/* get the list of all server accounts */
accounts = modest_conf_list_subkeys (priv->modest_conf, key, &err);
if (err) {
- g_error_free (err);
- g_printerr ("modest: failed to get subkeys for '%s'\n", key);
+ g_printerr ("modest: failed to get subkeys for '%s' (%s)\n", key,
+ err->message);
+ g_error_free(err);
return NULL;
}
cursor = accounts;
while (cursor) {
gchar *account = _modest_account_mgr_account_from_key ((gchar*)cursor->data, NULL, NULL);
- gchar *acc_proto = modest_account_mgr_get_string (self, account, MODEST_ACCOUNT_PROTO,
- TRUE, NULL);
- ModestProtocol this_proto = modest_protocol_info_get_protocol (acc_proto);
- ModestProtocolType this_type = modest_protocol_info_get_protocol_type (this_proto);
-
- if ((this_type != MODEST_PROTOCOL_TYPE_UNKNOWN && this_type != type) ||
- (this_proto != MODEST_PROTOCOL_UNKNOWN && this_proto != proto)) {
+ gchar *acc_proto = modest_account_mgr_get_string (self, account, MODEST_ACCOUNT_PROTO,TRUE);
+ ModestTransportStoreProtocol this_proto =
+ modest_protocol_info_get_transport_store_protocol (acc_proto);
+ if (this_proto != MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN && this_proto != proto) {
GSList *nxt = cursor->next;
accounts = g_slist_delete_link (accounts, cursor);
cursor = nxt;
strip_prefix_from_elements (accounts, strlen(key)+1);
return accounts;
}
-
+#endif
GSList*
-modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err)
+modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled)
{
GSList *accounts;
ModestAccountMgrPrivate *priv;
+ GError *err = NULL;
+
const size_t prefix_len = strlen (MODEST_ACCOUNT_NAMESPACE "/");
g_return_val_if_fail (self, NULL);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
-
+
accounts = modest_conf_list_subkeys (priv->modest_conf,
- MODEST_ACCOUNT_NAMESPACE, err);
+ MODEST_ACCOUNT_NAMESPACE, &err);
+ if (err) {
+ g_printerr ("modest: failed to get subkeys (%s): %s\n",
+ MODEST_ACCOUNT_NAMESPACE, err->message);
+ g_error_free (err);
+ return NULL; /* assume accounts did not get value when err is set...*/
+ }
strip_prefix_from_elements (accounts, prefix_len);
- return accounts;
+
+ GSList *result = NULL;
+
+ /* Unescape the keys to get the account names: */
+ GSList *iter = accounts;
+ while (iter) {
+ if (!(iter->data))
+ continue;
+
+ const gchar* account_name_key = (const gchar*)iter->data;
+ /* printf ("DEBUG: %s: account_name_key=%s\n", __FUNCTION__, account_name_key); */
+ gchar* unescaped_name = account_name_key ?
+ modest_conf_key_unescape (account_name_key)
+ : NULL;
+ /* printf (" DEBUG: %s: unescaped name=%s\n", __FUNCTION__, unescaped_name); */
+
+ gboolean add = TRUE;
+ if (only_enabled) {
+ if (unescaped_name &&
+ !modest_account_mgr_get_enabled (self, unescaped_name)) {
+ add = FALSE;
+ }
+ }
+
+ if (add) {
+ result = g_slist_append (result, unescaped_name);
+ }
+ else {
+ g_free (unescaped_name);
+ }
+
+ iter = g_slist_next (iter);
+ }
+
+ /* TODO: Free the strings too? */
+ g_slist_free (accounts);
+ accounts = NULL;
+
+ return result;
}
gchar *
modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name,
- const gchar *key, gboolean server_account, GError **err) {
+ const gchar *key, gboolean server_account) {
ModestAccountMgrPrivate *priv;
gchar *keyname;
gchar *retval;
+ GError *err = NULL;
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (name, NULL);
keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_get_string (priv->modest_conf, keyname, err);
+ retval = modest_conf_get_string (priv->modest_conf, keyname, &err);
+ if (err) {
+ g_printerr ("modest: error getting string '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = NULL;
+ }
g_free (keyname);
return retval;
}
+gchar *
+modest_account_mgr_get_password (ModestAccountMgr *self, const gchar *name,
+ const gchar *key, gboolean server_account)
+{
+ return modest_account_mgr_get_string (self, name, key, server_account);
+
+}
+
+
+
gint
-modest_account_mgr_get_int (ModestAccountMgr *self, const gchar *name,
- const gchar *key, gboolean server_account, GError **err)
+modest_account_mgr_get_int (ModestAccountMgr *self, const gchar *name, const gchar *key,
+ gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gint retval;
-
- g_return_val_if_fail (self, -1);
+ GError *err = NULL;
+
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), -1);
g_return_val_if_fail (name, -1);
g_return_val_if_fail (key, -1);
keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_get_int (priv->modest_conf, keyname, err);
+ retval = modest_conf_get_int (priv->modest_conf, keyname, &err);
+ if (err) {
+ g_printerr ("modest: error getting int '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = -1;
+ }
g_free (keyname);
return retval;
gboolean
modest_account_mgr_get_bool (ModestAccountMgr * self, const gchar *account,
- const gchar * key, gboolean server_account, GError ** err)
+ const gchar * key, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (account, FALSE);
g_return_val_if_fail (key, FALSE);
keyname = _modest_account_mgr_get_account_keyname (account, key, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_get_bool (priv->modest_conf, keyname, err);
-
+ retval = modest_conf_get_bool (priv->modest_conf, keyname, &err);
+ if (err) {
+ g_printerr ("modest: error getting bool '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
+ g_free (keyname);
+
+ return retval;
+}
+
+
+
+GSList *
+modest_account_mgr_get_list (ModestAccountMgr *self, const gchar *name,
+ const gchar *key, ModestConfValueType list_type,
+ gboolean server_account)
+{
+ ModestAccountMgrPrivate *priv;
+
+ gchar *keyname;
+ GSList *retval;
+ GError *err = NULL;
+
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), NULL);
+ g_return_val_if_fail (name, NULL);
+ g_return_val_if_fail (key, NULL);
+
+ keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
+
+ priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+ retval = modest_conf_get_list (priv->modest_conf, keyname, list_type, &err);
+ if (err) {
+ g_printerr ("modest: error getting list '%s': %s\n", keyname,
+ err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
return retval;
gboolean
modest_account_mgr_set_string (ModestAccountMgr * self, const gchar * name,
- const gchar * key, const gchar * val,
- gboolean server_account, GError ** err)
+ const gchar * key, const gchar * val, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (key, FALSE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_set_string (priv->modest_conf, keyname, val,
- err);
-
- g_free (keyname);
+ retval = modest_conf_set_string (priv->modest_conf, keyname, val, &err);
+ if (err) {
+ g_printerr ("modest: error setting string '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
+ g_free (keyname);
return retval;
}
gboolean
+modest_account_mgr_set_password (ModestAccountMgr * self, const gchar * name,
+ const gchar * key, const gchar * val, gboolean server_account)
+{
+ return modest_account_mgr_set_password (self, name, key, val, server_account);
+}
+
+
+
+gboolean
modest_account_mgr_set_int (ModestAccountMgr * self, const gchar * name,
- const gchar * key, int val, gboolean server_account,
- GError ** err)
+ const gchar * key, int val, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gboolean retval;
-
- g_return_val_if_fail (self, FALSE);
+ GError *err = NULL;
+
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (key, FALSE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_set_int (priv->modest_conf, keyname, val, err);
-
+ retval = modest_conf_set_int (priv->modest_conf, keyname, val, &err);
+ if (err) {
+ g_printerr ("modest: error setting int '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
return retval;
}
gboolean
modest_account_mgr_set_bool (ModestAccountMgr * self, const gchar * name,
- const gchar * key, gboolean val, gboolean server_account,
- GError ** err)
+ const gchar * key, gboolean val, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (key, FALSE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_set_bool (priv->modest_conf, keyname, val, err);
-
+ retval = modest_conf_set_bool (priv->modest_conf, keyname, val, &err);
+ if (err) {
+ g_printerr ("modest: error setting bool '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
return retval;
}
-void
+
+gboolean
modest_account_mgr_set_list (ModestAccountMgr *self,
const gchar *name,
const gchar *key,
GSList *val,
ModestConfValueType list_type,
- gboolean server_account,
- GError **err)
+ gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
+ GError *err = NULL;
+ gboolean retval;
- g_return_if_fail (self);
- g_return_if_fail (name);
- g_return_if_fail (key);
- g_return_if_fail (val);
+ g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (name, FALSE);
+ g_return_val_if_fail (key, FALSE);
+ g_return_val_if_fail (val, FALSE);
keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- modest_conf_set_list (priv->modest_conf, keyname, val, list_type, err);
+ retval = modest_conf_set_list (priv->modest_conf, keyname, val, list_type, &err);
+ if (err) {
+ g_printerr ("modest: error setting list '%s': %s\n", keyname, err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
+
+ return retval;
}
gboolean
modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name,
- gboolean server_account, GError ** err)
+ gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
keyname = _modest_account_mgr_get_account_keyname (name, NULL, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_key_exists (priv->modest_conf, keyname, err);
-
+ retval = modest_conf_key_exists (priv->modest_conf, keyname, &err);
+ if (err) {
+ g_printerr ("modest: error determining existance of '%s': %s\n", keyname,
+ err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
return retval;
}
-
-GSList *
-modest_account_mgr_get_list (ModestAccountMgr *self,
- const gchar *name,
- const gchar *key,
- ModestConfValueType list_type,
- gboolean server_account,
- GError **err)
+gboolean modest_account_mgr_account_with_display_name_exists (ModestAccountMgr *self,
+ const gchar *display_name)
{
- ModestAccountMgrPrivate *priv;
-
- gchar *keyname;
- GSList *retval;
+ GSList *account_names = NULL;
+ GSList *cursor = NULL;
- g_return_val_if_fail (self, NULL);
- g_return_val_if_fail (name, NULL);
- g_return_val_if_fail (key, NULL);
+ cursor = account_names = modest_account_mgr_account_names (self,
+ TRUE /* enabled accounts, because disabled accounts are not user visible. */);
- keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
+ gboolean found = FALSE;
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_get_list (priv->modest_conf, keyname, list_type, err);
- g_free (keyname);
+ /* Look at each non-server account to check their display names; */
+ while (cursor) {
+ const gchar * account_name = (gchar*)cursor->data;
+
+ ModestAccountData *account_data = modest_account_mgr_get_account_data (self, account_name);
+ if (!account_data) {
+ g_printerr ("modest: failed to get account data for %s\n", account_name);
+ continue;
+ }
- return retval;
+ if(account_data->display_name && (strcmp (account_data->display_name, display_name) == 0)) {
+ found = TRUE;
+ break;
+ }
+
+ modest_account_mgr_free_account_data (self, account_data);
+ cursor = cursor->next;
+ }
+ g_slist_free (account_names);
+
+ return found;
}
+
+
gboolean
-modest_account_mgr_unset (ModestAccountMgr *self,
- const gchar *name,
- const gchar *key,
- gboolean server_account,
- GError **err)
+modest_account_mgr_unset (ModestAccountMgr *self, const gchar *name,
+ const gchar *key, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
-
+
gchar *keyname;
gboolean retval;
-
- g_return_val_if_fail (self, FALSE);
+ GError *err = NULL;
+
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
g_return_val_if_fail (name, FALSE);
g_return_val_if_fail (key, FALSE);
keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- retval = modest_conf_remove_key (priv->modest_conf, keyname, err);
-
+ retval = modest_conf_remove_key (priv->modest_conf, keyname, &err);
+ if (err) {
+ g_printerr ("modest: error unsetting'%s': %s\n", keyname,
+ err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
g_free (keyname);
return retval;
}
projects / modest / blobdiff