-/* modest-account-mgr.c */
-
-/* insert (c)/licensing information) */
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
#include <string.h>
-#include "modest-account-mgr.h"
+#include <modest-marshal.h>
+#include <modest-account-mgr.h>
+#include <modest-account-mgr-priv.h>
+#include <modest-account-mgr-helpers.h>
/* 'private'/'protected' functions */
-static void modest_account_mgr_class_init (ModestAccountMgrClass *klass);
-static void modest_account_mgr_init (ModestAccountMgr *obj);
-static void modest_account_mgr_finalize (GObject *obj);
-
-static gchar* get_account_keyname (const gchar *accname, const gchar *name);
-static gchar* get_server_account_keyname (const gchar *accname, const gchar *name);
+static void modest_account_mgr_class_init (ModestAccountMgrClass * klass);
+static void modest_account_mgr_init (ModestAccountMgr * obj);
+static void modest_account_mgr_finalize (GObject * obj);
/* list my signals */
enum {
- /* MY_SIGNAL_1, */
- /* MY_SIGNAL_2, */
+ ACCOUNT_CHANGED_SIGNAL,
+ ACCOUNT_REMOVED_SIGNAL,
LAST_SIGNAL
};
-typedef struct _ModestAccountMgrPrivate ModestAccountMgrPrivate;
-struct _ModestAccountMgrPrivate {
- ModestConf *modest_conf;
-};
-#define MODEST_ACCOUNT_MGR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
- MODEST_TYPE_ACCOUNT_MGR, \
- ModestAccountMgrPrivate))
+
/* globals */
static GObjectClass *parent_class = NULL;
+static guint signals[LAST_SIGNAL] = {0};
+
+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);
+
+ /* 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;
+ }
+
+ 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;
+
+ /* account was removed -- emit this, even if the account was disabled */
+ if (is_account_key && event == MODEST_CONF_EVENT_KEY_UNSET) {
+ g_signal_emit (G_OBJECT(self), signals[ACCOUNT_REMOVED_SIGNAL], 0,
+ account, is_server_account);
+ g_free (account);
+ return;
+ }
+
+ /* is this account enabled? */
+ if (is_server_account)
+ enabled = TRUE;
+ else
+ enabled = modest_account_mgr_get_enabled (self, account);
+
+ /* server account was changed, default account was changed
+ * and always notify when enabled/disabled changes
+ */
+ 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_free (account);
+}
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
GType
modest_account_mgr_get_type (void)
{
static GType my_type = 0;
+
if (!my_type) {
static const GTypeInfo my_info = {
- sizeof(ModestAccountMgrClass),
- NULL, /* base init */
- NULL, /* base finalize */
+ sizeof (ModestAccountMgrClass),
+ NULL, /* base init */
+ NULL, /* base finalize */
(GClassInitFunc) modest_account_mgr_class_init,
- NULL, /* class finalize */
- NULL, /* class data */
- sizeof(ModestAccountMgr),
- 1, /* n_preallocs */
+ NULL, /* class finalize */
+ NULL, /* class data */
+ sizeof (ModestAccountMgr),
+ 1, /* n_preallocs */
(GInstanceInitFunc) modest_account_mgr_init,
+ NULL
};
my_type = g_type_register_static (G_TYPE_OBJECT,
- "ModestAccountMgr",
- &my_info, 0);
+ "ModestAccountMgr",
+ &my_info, 0);
}
return my_type;
}
static void
-modest_account_mgr_class_init (ModestAccountMgrClass *klass)
+modest_account_mgr_class_init (ModestAccountMgrClass * klass)
{
GObjectClass *gobject_class;
- gobject_class = (GObjectClass*) klass;
+ gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_peek_parent (klass);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_account_mgr_finalize;
- g_type_class_add_private (gobject_class, sizeof(ModestAccountMgrPrivate));
-
- /* signal definitions go here, e.g.: */
-/* signals[MY_SIGNAL_1] = */
-/* g_signal_new ("my_signal_1",....); */
-/* signals[MY_SIGNAL_2] = */
-/* g_signal_new ("my_signal_2",....); */
-/* etc. */
+ g_type_class_add_private (gobject_class,
+ sizeof (ModestAccountMgrPrivate));
+
+ /* signal definitions */
+ signals[ACCOUNT_REMOVED_SIGNAL] =
+ g_signal_new ("account_removed",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET(ModestAccountMgrClass,account_removed),
+ NULL, NULL,
+ modest_marshal_VOID__STRING_BOOLEAN,
+ G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN);
+ signals[ACCOUNT_CHANGED_SIGNAL] =
+ g_signal_new ("account_changed",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET(ModestAccountMgrClass,account_changed),
+ NULL, NULL,
+ modest_marshal_VOID__STRING_STRING_BOOLEAN,
+ G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
}
static void
-modest_account_mgr_init (ModestAccountMgr *obj)
+modest_account_mgr_init (ModestAccountMgr * obj)
{
- ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(obj);
- priv->modest_conf = NULL;
+ ModestAccountMgrPrivate *priv =
+ MODEST_ACCOUNT_MGR_GET_PRIVATE (obj);
+
+ priv->modest_conf = NULL;
}
static void
-modest_account_mgr_finalize (GObject *obj)
+modest_account_mgr_finalize (GObject * obj)
{
- ModestAccountMgr *self = MODEST_ACCOUNT_MGR(obj);
- ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
+ ModestAccountMgrPrivate *priv =
+ MODEST_ACCOUNT_MGR_GET_PRIVATE (obj);
- g_object_unref (G_OBJECT(priv->modest_conf));
- priv->modest_conf = NULL;
+ if (priv->modest_conf) {
+ g_object_unref (G_OBJECT(priv->modest_conf));
+ priv->modest_conf = NULL;
+ }
+
+ G_OBJECT_CLASS(parent_class)->finalize (obj);
}
-GObject*
+
+ModestAccountMgr *
modest_account_mgr_new (ModestConf *conf)
{
GObject *obj;
g_return_val_if_fail (conf, NULL);
- obj = G_OBJECT(g_object_new(MODEST_TYPE_ACCOUNT_MGR, NULL));
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(obj);
+ obj = G_OBJECT (g_object_new (MODEST_TYPE_ACCOUNT_MGR, NULL));
+ priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (obj);
- /*
- * increase the ref count on the modest_conf. Normally, the
- * ModestConf should outlive the ModestAccountMgr though
- */
- g_object_ref(G_OBJECT(priv->modest_conf = conf));
- return obj;
+ g_object_ref (G_OBJECT(conf));
+ priv->modest_conf = conf;
+
+ g_signal_connect (G_OBJECT (conf), "key_changed",
+ G_CALLBACK (on_key_change),
+ obj);
+
+ return MODEST_ACCOUNT_MGR (obj);
}
+static const gchar *
+null_means_empty (const gchar * str)
+{
+ return str ? str : "";
+}
+
gboolean
-modest_account_mgr_add_account (ModestAccountMgr *self, const gchar* name,
+modest_account_mgr_add_account (ModestAccountMgr *self,
+ const gchar *name,
const gchar *store_account,
const gchar *transport_account,
- GError **err)
+ gboolean enabled)
{
ModestAccountMgrPrivate *priv;
gchar *key;
- gboolean retval;
-
- g_return_val_if_fail (self, FALSE);
+ gboolean ok;
+ gchar *default_account;
+ GError *err = NULL;
+
+ 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, err)) {
- g_warning ("account already exists");
- //return FALSE;
- }
+ g_return_val_if_fail (strchr(name, '/') == NULL, FALSE);
+
+ priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+
/*
* we create the account by adding an account 'dir', with the name <name>,
* and in that the 'display_name' string key
*/
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-
- key = get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME);
- modest_conf_set_string (priv->modest_conf, key, name, err);
+ key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME, FALSE);
+ 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);
g_free (key);
-
+ if (!ok) {
+ g_printerr ("modest: cannot set display name\n");
+ if (err) {
+ g_printerr ("modest: %s\n", err->message);
+ g_error_free (err);
+ }
+ return FALSE;
+ }
+
if (store_account) {
- key = get_account_keyname (name, MODEST_ACCOUNT_STORE_ACCOUNT);
- modest_conf_set_string (priv->modest_conf, key, store_account, err);
+ 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);
g_free (key);
+ if (!ok) {
+ g_printerr ("modest: failed to set store account '%s'\n",
+ store_account);
+ if (err) {
+ g_printerr ("modest: %s\n", err->message);
+ g_error_free (err);
+ }
+
+ return FALSE;
+ }
}
-
+
if (transport_account) {
- key = get_account_keyname (name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT);
- 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);
+ if (err) {
+ g_printerr ("modest: %s\n", err->message);
+ g_error_free (err);
+ }
+ return FALSE;
+ }
}
+ modest_account_mgr_set_enabled (self, name, enabled);
- return TRUE; /* TODO: error handling */
+ /* 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_remove_account (ModestAccountMgr *self, const gchar* name,
- GError **err)
+modest_account_mgr_add_server_account (ModestAccountMgr * self,
+ const gchar * name, const gchar *hostname,
+ const gchar * username, const gchar * password,
+ ModestProtocol proto,
+ ModestProtocol security,
+ ModestProtocol auth)
{
ModestAccountMgrPrivate *priv;
gchar *key;
- gboolean retval;
-
- g_return_val_if_fail (self, FALSE);
+ ModestProtocolType proto_type;
+ gboolean ok = TRUE;
+ 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);
- if (!modest_account_mgr_account_exists (self, name, err)) {
- g_warning ("account doest not exist");
- return 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, &err)) {
+ g_printerr ("modest: server account '%s' already exists\n", name);
+ g_free (key);
+ ok = FALSE;
}
+ if (!ok)
+ goto cleanup;
+
+ 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);
+ 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);
+ 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;
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
- key = get_account_keyname (name, NULL);
-
- retval = modest_conf_remove_key (priv->modest_conf, key, NULL);
-
+ /* 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_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);
- return retval;
-}
+ 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_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;
+
+ if (proto_type == MODEST_PROTOCOL_TYPE_STORE) {
+
+ GSList *option_list = NULL;
+
+ /* Connection options. Some options are only valid for IMAP
+ accounts but it's OK for just now since POP is still not
+ supported */
+ key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_OPTIONS, TRUE);
+ /* Enable subscriptions and check the mails in all folders */
+ option_list = g_slist_append (option_list, MODEST_ACCOUNT_OPTION_USE_LSUB);
+ option_list = g_slist_append (option_list, MODEST_ACCOUNT_OPTION_CHECK_ALL);
+
+ /* TODO: Remove this hack. These are hard-coded camel options to make the connection work.
+ * The regular connection options (set later here) should be interpreted instead
+ * because in future these camel options will not be in gconf. murrayc.
+ */
+ /* Security options */
+ switch (security) {
+ case MODEST_PROTOCOL_SECURITY_NONE:
+ option_list = g_slist_append (option_list, MODEST_ACCOUNT_OPTION_SSL "= " MODEST_ACCOUNT_OPTION_SSL_NEVER);
+ break;
+ case MODEST_PROTOCOL_SECURITY_SSL:
+ case MODEST_PROTOCOL_SECURITY_TLS:
+ option_list = g_slist_append (option_list, MODEST_ACCOUNT_OPTION_SSL "= " MODEST_ACCOUNT_OPTION_SSL_ALWAYS);
+ break;
+ case MODEST_PROTOCOL_SECURITY_TLS_OP:
+ option_list = g_slist_append (option_list, MODEST_ACCOUNT_OPTION_SSL "= " MODEST_ACCOUNT_OPTION_SSL_WHEN_POSSIBLE);
+ break;
+ default:
+ g_warning ("Invalid security option");
+ }
+ ok = modest_conf_set_list (priv->modest_conf, key,
+ option_list, MODEST_CONF_VALUE_STRING, &err);
+ if (err) {
+ g_printerr ("modest: failed to set %s: %s\n", key, err->message);
+ g_error_free (err);
+ ok = FALSE;
+ }
+ g_slist_free (option_list);
+ g_free (key);
+
+
+ /* 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;
+ }
-static const gchar*
-null_means_empty(const gchar* str)
-{
- return str ? str : "";
+ return TRUE;
}
gboolean
-modest_account_mgr_add_server_account (ModestAccountMgr *self,
- const gchar *name,
- const gchar *hostname,
- const gchar *username,
- const gchar *password,
- const gchar *proto)
+modest_account_mgr_add_server_account_uri (ModestAccountMgr * self,
+ const gchar *name, ModestProtocol proto,
+ const gchar *uri)
{
ModestAccountMgrPrivate *priv;
- gchar *acckey, *key;
-
- g_return_val_if_fail (self, FALSE);
+ 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_protocol_name(proto), NULL);
+ g_free (key);
- /* TODO: check already exists */
-
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
- acckey = g_strconcat (MODEST_SERVER_ACCOUNT_NAMESPACE, "/",
- name, NULL);
-
- if (modest_conf_key_exists(priv->modest_conf, acckey, NULL)) {
- g_warning ("server account %s already exists", name);
- g_free (acckey);
+ if (!ok) {
+ g_printerr ("modest: failed to set proto\n");
return FALSE;
}
-
- /* hostname */
- key = g_strconcat (acckey, "/", MODEST_ACCOUNT_HOSTNAME, NULL);
- modest_conf_set_string (priv->modest_conf, key,
- null_means_empty(hostname), NULL);
- g_free (key);
-
- /* username */
- key = g_strconcat (acckey, "/", MODEST_ACCOUNT_USERNAME, NULL);
- modest_conf_set_string (priv->modest_conf, key,
- null_means_empty(username), NULL);
+
+ /* 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);
- /* password */
- key = g_strconcat (acckey, "/", MODEST_ACCOUNT_PASSWORD, NULL);
- modest_conf_set_string (priv->modest_conf, key,
- null_means_empty(password), NULL);
- g_free (key);
+ if (!ok) {
+ g_printerr ("modest: failed to set uri\n");
+ return FALSE;
+ }
+ return TRUE;
+}
- /* proto */
- key = g_strconcat (acckey, "/", MODEST_ACCOUNT_PROTO, NULL);
- modest_conf_set_string (priv->modest_conf, key,
- null_means_empty(proto),
- NULL);
- g_free (key);
- return TRUE; /* FIXME: better error checking */
-}
gboolean
-modest_account_mgr_remove_server_account (ModestAccountMgr *self,
- const gchar *name,
- GError **err)
+modest_account_mgr_remove_account (ModestAccountMgr * self,
+ const gchar * name, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
- gchar *acckey, *key;
+ 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);
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-
- acckey = g_strconcat (MODEST_SERVER_ACCOUNT_NAMESPACE, "/",
- name, NULL);
-
- if (!modest_conf_key_exists(priv->modest_conf, acckey, NULL)) {
- g_warning ("server account %s does not exist exist", name);
- g_free (acckey);
+ if (!modest_account_mgr_account_exists (self, name, server_account)) {
+ g_printerr ("modest: account '%s' does not exist\n", name);
return FALSE;
}
- retval = modest_conf_remove_key (priv->modest_conf, acckey, NULL);
- g_free (acckey);
+ /* 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);
+
+ if (err) {
+ 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;
}
+/* strip the first /n/ character from each element
+ * caller must make sure all elements are strings with
+ * length >= n, and also that data can be freed.
+ * change is in-place
+ */
+static void
+strip_prefix_from_elements (GSList * lst, guint n)
+{
+ while (lst) {
+ memmove (lst->data, lst->data + n,
+ strlen(lst->data) - n + 1);
+ lst = lst->next;
+ }
+}
+
GSList*
-modest_account_mgr_server_account_names (ModestAccountMgr *self,
- const gchar* account_name,
- ModestProtoType type,
- const gchar* proto,
- gboolean only_enabled)
+modest_account_mgr_search_server_accounts (ModestAccountMgr * self,
+ const gchar * account_name,
+ ModestProtocolType type,
+ ModestProtocol proto)
{
GSList *accounts;
GSList *cursor;
ModestAccountMgrPrivate *priv;
-
+ gchar *key;
+ GError *err = NULL;
+
g_return_val_if_fail (self, NULL);
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
- accounts = modest_conf_list_subkeys (priv->modest_conf,
- MODEST_SERVER_ACCOUNT_NAMESPACE,
- NULL);
-
- /* no restrictions, return everything */
- if (type == MODEST_PROTO_TYPE_ANY && !proto)
- return accounts;
-
- /* otherwise, filter out the none-matching ones */
+ 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_printerr ("modest: failed to get subkeys for '%s' (%s)\n", key,
+ err->message);
+ g_error_free(err);
+ return NULL;
+ }
+
+ /* filter out the ones with the wrong protocol */
+ /* we could optimize for unknown proto / unknown type, but it will only
+ * make the code more complex */
cursor = accounts;
- while (cursor) {
- gchar *keyspace, *proto_key, *acc_proto;
-
- keyspace = (gchar*) cursor->data;
- proto_key = g_strconcat (keyspace, "/", MODEST_ACCOUNT_PROTO, NULL);
- acc_proto = modest_conf_get_string (priv->modest_conf, proto_key,
- NULL);
- g_free (proto_key);
-
- if ((!acc_proto) || /* proto not defined? */
- (type != MODEST_PROTO_TYPE_ANY && /* proto type ... */
- modest_proto_type (acc_proto) != type) || /* ... matches? */
- (proto && strcmp(proto,acc_proto) != 0)) { /* proto matches? */
- /* no match: remove from the list */
+ 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);
+ 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)) {
GSList *nxt = cursor->next;
- g_free (acc_proto);
accounts = g_slist_delete_link (accounts, cursor);
cursor = nxt;
} else
cursor = cursor->next;
+
+ g_free (account);
+ g_free (acc_proto);
}
-
- return accounts;
+
+ /* +1 because we must remove the ending '/' as well */
+ strip_prefix_from_elements (accounts, strlen(key)+1);
+ return accounts;
}
-
GSList*
-modest_account_mgr_account_names (ModestAccountMgr *self, GError **err)
+modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled)
{
- GSList *accounts, *cursor;
+ 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);
+ priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+
+ accounts = modest_conf_list_subkeys (priv->modest_conf,
+ 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);
+
+ 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 modest_conf_list_subkeys (priv->modest_conf,
- MODEST_ACCOUNT_NAMESPACE,
- err);
+ return result;
}
+gchar *
+modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name,
+ const gchar *key, gboolean server_account) {
-static gchar*
-get_account_string (ModestAccountMgr *self, const gchar *name,
- const gchar *key, gboolean server_account,
- GError **err)
-{
ModestAccountMgrPrivate *priv;
-
+
gchar *keyname;
- gchar * retval;
-
+ gchar *retval;
+ GError *err = NULL;
+
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (name, NULL);
g_return_val_if_fail (key, NULL);
- if (server_account)
- keyname = get_server_account_keyname (name, key);
- else
- keyname = get_account_keyname (name, key);
-
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
- retval = modest_conf_get_string (priv->modest_conf,keyname,err);
- g_free (keyname);
+ 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);
+ 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_server_account_string (ModestAccountMgr *self, const gchar *name,
- const gchar *key, GError **err)
+gchar *
+modest_account_mgr_get_password (ModestAccountMgr *self, const gchar *name,
+ const gchar *key, gboolean server_account)
{
- return get_account_string (self, name, key, TRUE, err);
-}
+ return modest_account_mgr_get_string (self, name, key, server_account);
-gchar*
-modest_account_mgr_get_account_string (ModestAccountMgr *self, const gchar *name,
- const gchar *key, GError **err)
-{
- return get_account_string (self, name, key, FALSE, err);
}
-static gint
-get_account_int (ModestAccountMgr *self, const gchar *name,
- const gchar *key, gboolean server_account,
- GError **err)
+gint
+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);
- if (server_account)
- keyname = get_server_account_keyname (name, key);
- else
- keyname = get_account_keyname (name, key);
+ 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);
+ priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+ 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;
-}
-
-gint
-modest_account_mgr_get_server_account_int (ModestAccountMgr *self, const gchar *name,
- const gchar *key, GError **err)
-{
- return get_account_int (self, name, key, TRUE, err);
-}
-
-gint
-modest_account_mgr_get_account_int (ModestAccountMgr *self, const gchar *name,
- const gchar *key, GError **err)
-{
- return get_account_int (self, name, key, FALSE, err);
+ return retval;
}
-static gboolean
-get_account_bool (ModestAccountMgr *self, const gchar *name,
- const gchar *key, gboolean server_account,
- GError **err)
+gboolean
+modest_account_mgr_get_bool (ModestAccountMgr * self, const gchar *account,
+ const gchar * key, gboolean server_account)
{
ModestAccountMgrPrivate *priv;
-
+
gchar *keyname;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, -1);
- g_return_val_if_fail (name, -1);
- g_return_val_if_fail (key, -1);
-
- if (server_account)
- keyname = get_server_account_keyname (name, key);
- else
- keyname = get_account_keyname (name, key);
+ 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);
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
- retval = modest_conf_get_int (priv->modest_conf,keyname,err);
- g_free (keyname);
+ 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);
+ 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;
}
-gint
-modest_account_mgr_get_server_account_bool (ModestAccountMgr *self, const gchar *name,
- const gchar *key, GError **err)
+GSList *
+modest_account_mgr_get_list (ModestAccountMgr *self, const gchar *name,
+ const gchar *key, ModestConfValueType list_type,
+ gboolean server_account)
{
- return get_account_bool (self, name, key, TRUE, err);
-}
-
-gint
-modest_account_mgr_get_account_bool (ModestAccountMgr *self, const gchar *name,
- const gchar *key, GError **err)
-{
- return get_account_bool (self, name, key, FALSE, err);
-}
+ 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;
+}
-static gboolean
-set_account_string (ModestAccountMgr *self, const gchar *name,
- const gchar *key, const gchar* val, gboolean server_account,
- GError **err)
+gboolean
+modest_account_mgr_set_string (ModestAccountMgr * self, const gchar * name,
+ 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);
- if (server_account)
- keyname = get_server_account_keyname (name, key);
- else
- keyname = get_account_keyname (name, key);
-
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-
- retval = modest_conf_set_string (priv->modest_conf,keyname,val,err);
+ keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
+
+ priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
- 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_server_account_string (ModestAccountMgr *self, const gchar *name,
- const gchar *key, const gchar* val,
- GError **err)
+modest_account_mgr_set_password (ModestAccountMgr * self, const gchar * name,
+ const gchar * key, const gchar * val, gboolean server_account)
{
- return set_account_string (self, name, key, val, TRUE, err);
+ return modest_account_mgr_set_password (self, name, key, val, server_account);
}
gboolean
-modest_account_mgr_set_account_string (ModestAccountMgr *self, const gchar *name,
- const gchar *key, const gchar* val,
- GError **err)
-{
- return set_account_string (self, name, key, val, FALSE, err);
-}
-
-
-static gboolean
-set_account_int (ModestAccountMgr *self, const gchar *name,
- const gchar *key, gboolean server_account, int val,
- GError **err)
+modest_account_mgr_set_int (ModestAccountMgr * self, const gchar * name,
+ const gchar * key, int 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);
- if (server_account)
- keyname = get_server_account_keyname (name, key);
- else
- keyname = get_account_keyname (name, key);
-
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
+ keyname = _modest_account_mgr_get_account_keyname (name, key, server_account);
- retval = modest_conf_set_int (priv->modest_conf,keyname,val,err);
+ priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+ 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_server_account_int (ModestAccountMgr *self, const gchar *name,
- const gchar *key, int val,
- GError **err)
+modest_account_mgr_set_bool (ModestAccountMgr * self, const gchar * name,
+ const gchar * key, gboolean val, gboolean server_account)
{
- return set_account_int (self, name, key, val, TRUE, err);
-}
+ ModestAccountMgrPrivate *priv;
+ gchar *keyname;
+ gboolean retval;
+ GError *err = NULL;
-gboolean
-modest_account_mgr_set_account_int (ModestAccountMgr *self, const gchar *name,
- const gchar *key, int val,
- GError **err)
-{
- return set_account_int (self, name, key, val, FALSE, err);
-}
+ 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_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;
+}
-static gboolean
-set_account_bool (ModestAccountMgr *self, const gchar *name,
- const gchar *key, gboolean server_account, gboolean val,
- GError **err)
+gboolean
+modest_account_mgr_set_list (ModestAccountMgr *self,
+ const gchar *name,
+ const gchar *key,
+ GSList *val,
+ ModestConfValueType list_type,
+ gboolean server_account)
{
ModestAccountMgrPrivate *priv;
-
gchar *keyname;
+ GError *err = NULL;
gboolean retval;
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (name, FALSE);
- g_return_val_if_fail (key, FALSE);
-
- if (server_account)
- keyname = get_server_account_keyname (name, key);
- else
- keyname = get_account_keyname (name, key);
-
- priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self);
-
- retval = modest_conf_set_bool (priv->modest_conf,keyname,val,err);
+ 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);
+ 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_set_server_account_bool (ModestAccountMgr *self, const gchar *name,
- const gchar *key, gboolean val,
- GError **err)
-{
- return set_account_bool (self, name, key, val, TRUE, err);
-}
-
-
-gboolean
-modest_account_mgr_set_account_bool (ModestAccountMgr *self, const gchar *name,
- const gchar *key, gboolean val,
- GError **err)
-{
- return set_account_bool (self, name, key, val, FALSE, err);
+ return retval;
}
-
-
-
-
gboolean
-account_exists (ModestAccountMgr *self, const gchar *name, gboolean server_account,
- GError **err)
+modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name,
+ gboolean server_account)
{
ModestAccountMgrPrivate *priv;
gchar *keyname;
gboolean retval;
+ GError *err = NULL;
- g_return_val_if_fail (self, FALSE);
- g_return_val_if_fail (name, FALSE);
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE);
+ g_return_val_if_fail (name, FALSE);
- if (server_account)
- keyname = get_account_keyname (name, NULL);
- else
- keyname = get_server_account_keyname (name, NULL);
+ 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);
-
+ priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+ 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;
}
-
-gboolean
-modest_account_mgr_server_account_exists (ModestAccountMgr *self, const gchar *name,
- GError **err)
+gboolean modest_account_mgr_account_with_display_name_exists (ModestAccountMgr *self,
+ const gchar *display_name)
{
- return account_exists (self, name, TRUE, err);
-}
-
-
+ GSList *account_names = NULL;
+ GSList *cursor = NULL;
+
+ cursor = account_names = modest_account_mgr_account_names (self,
+ TRUE /* enabled accounts, because disabled accounts are not user visible. */);
-gboolean
-modest_account_mgr_account_exists (ModestAccountMgr *self, const gchar *name,
- GError **err)
-{
- return account_exists (self, name, FALSE, err);
+ gboolean found = FALSE;
+
+ /* 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;
+ }
+
+ 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;
}
-/* must be freed by caller */
-static gchar*
-get_account_keyname (const gchar *accname, const gchar *name)
-{
- if (name)
- return g_strconcat
- (MODEST_ACCOUNT_NAMESPACE, "/", accname, "/", name, NULL);
- else
- return g_strconcat
- (MODEST_ACCOUNT_NAMESPACE, "/", accname, NULL);
-}
-
-/* must be freed by caller */
-static gchar*
-get_server_account_keyname (const gchar *accname, const gchar *name)
+gboolean
+modest_account_mgr_unset (ModestAccountMgr *self, const gchar *name,
+ const gchar *key, gboolean server_account)
{
- if (name)
- return g_strconcat
- (MODEST_SERVER_ACCOUNT_NAMESPACE, "/", accname, "/", name, NULL);
- else
- return g_strconcat
- (MODEST_SERVER_ACCOUNT_NAMESPACE, "/", accname, NULL);
+ ModestAccountMgrPrivate *priv;
+
+ gchar *keyname;
+ gboolean retval;
+ 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);
+ if (err) {
+ g_printerr ("modest: error unsetting'%s': %s\n", keyname,
+ err->message);
+ g_error_free (err);
+ retval = FALSE;
+ }
+ g_free (keyname);
+ return retval;
}