X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=e6859df92dc8ab7bf2ba5dab15387d42674cd477;hp=4bbc96a26762a741312efd270a7a1439cb9d9ded;hb=3e7a3b4e5759d63285d8795435b2ceedaf63b216;hpb=32320a187c364c57585a45475acee9f6f9ce88c1 diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c index 4bbc96a..e6859df 100644 --- a/src/modest-account-mgr.c +++ b/src/modest-account-mgr.c @@ -1,122 +1,109 @@ -/* 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 -#include "modest-marshal.h" -#include "modest-account-keys.h" -#include "modest-account-mgr.h" +#include +#include +#include +#include /* '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_init (ModestAccountMgr * obj); +static void modest_account_mgr_finalize (GObject * obj); /* list my signals */ enum { - ACCOUNT_CHANGE_SIGNAL, - ACCOUNT_REMOVE_SIGNAL, - ACCOUNT_ADD_SIGNAL, + ACCOUNT_CHANGED_SIGNAL, + ACCOUNT_REMOVED_SIGNAL, LAST_SIGNAL }; -typedef struct _ModestAccountMgrPrivate ModestAccountMgrPrivate; -struct _ModestAccountMgrPrivate { - ModestConf *modest_conf; - GSList *current_accounts; -}; -#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 GSList * -delete_account_from_list (GSList *list, const gchar *name) +static void +on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpointer user_data) { - GSList *iter, *result; - - iter = list; - result = list; - while (iter) { - if (!strcmp (name, iter->data)) { - result = g_slist_delete_link (list, iter); - break; - } - - iter = g_slist_next (iter); - } - return result; -} + ModestAccountMgr *self; + ModestAccountMgrPrivate *priv; -static GSList * -find_account_in_list (GSList *list, const gchar *name) -{ - GSList *iter, *result; + gchar *account; + gboolean is_account_key, is_server_account; + gboolean enabled; - iter = list; - result = list; - while (iter) { - if (!strcmp (name, iter->data)) { - return iter; - break; - } + self = MODEST_ACCOUNT_MGR (user_data); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - iter = g_slist_next (iter); + /* 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; } - return NULL; -} - -/* Map configuration changes to account changes. - * Doing this here makes sure all changes are available and external changes - * are covered as well. */ - -static void -modest_account_mgr_check_change (ModestConf *conf, const gchar *key, - const gchar *new_value, gpointer user_data) -{ - ModestAccountMgr *amgr = user_data; - ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (amgr); - - if ((strlen (key) > strlen (MODEST_SERVER_ACCOUNT_NAMESPACE "/") - && g_str_has_prefix (key, MODEST_SERVER_ACCOUNT_NAMESPACE))) { - gchar *subkey = g_strdup(key + strlen (MODEST_SERVER_ACCOUNT_NAMESPACE "/")); - - if (! strstr (subkey, "/")) { /* no more '/' means an account was modified */ - if (!new_value) { - priv->current_accounts = - delete_account_from_list (priv->current_accounts, subkey); - g_signal_emit (amgr, signals[ACCOUNT_REMOVE_SIGNAL], 0, subkey); - } - } - else { - gchar *param; - - param = strstr (subkey, "/"); - param [0] = 0; - param++; - - /* that's the second case for a new account */ - if (!find_account_in_list (priv->current_accounts, subkey) && strstr (param, MODEST_ACCOUNT_PROTO)) { - priv->current_accounts = - g_slist_prepend (priv->current_accounts, g_strdup (subkey)); - g_signal_emit (amgr, signals[ACCOUNT_ADD_SIGNAL], 0, subkey); - } + /* is this account enabled? */ + if (is_server_account) + enabled = TRUE; + else + enabled = modest_account_mgr_get_enabled (self, account); - g_signal_emit (amgr, signals[ACCOUNT_CHANGE_SIGNAL], 0, subkey, param, new_value); - } + /* 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 (subkey); - } + g_free (account); } @@ -136,6 +123,7 @@ modest_account_mgr_get_type (void) sizeof (ModestAccountMgr), 1, /* n_preallocs */ (GInstanceInitFunc) modest_account_mgr_init, + NULL }; my_type = g_type_register_static (G_TYPE_OBJECT, @@ -149,8 +137,6 @@ static void modest_account_mgr_class_init (ModestAccountMgrClass * klass) { GObjectClass *gobject_class; - GType paramtypes[3] = {G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER}; - gobject_class = (GObjectClass *) klass; parent_class = g_type_class_peek_parent (klass); @@ -160,32 +146,30 @@ modest_account_mgr_class_init (ModestAccountMgrClass * klass) sizeof (ModestAccountMgrPrivate)); /* signal definitions */ - signals[ACCOUNT_ADD_SIGNAL] = - g_signal_newv ("account-add", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - NULL, NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, paramtypes); - - signals[ACCOUNT_REMOVE_SIGNAL] = - g_signal_newv ("account-remove", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - NULL, NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, paramtypes); - signals[ACCOUNT_CHANGE_SIGNAL] = - g_signal_newv ("account-change", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - NULL, NULL, NULL, - modest_marshal_VOID__POINTER_POINTER_POINTER, - G_TYPE_NONE, 3, paramtypes); + 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) { - ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); + ModestAccountMgrPrivate *priv = + MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); priv->modest_conf = NULL; } @@ -193,17 +177,20 @@ modest_account_mgr_init (ModestAccountMgr * obj) static void 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); if (priv->modest_conf) { g_object_unref (G_OBJECT(priv->modest_conf)); priv->modest_conf = NULL; } + + G_OBJECT_CLASS(parent_class)->finalize (obj); } -GObject * -modest_account_mgr_new (ModestConf * conf) + +ModestAccountMgr * +modest_account_mgr_new (ModestConf *conf) { GObject *obj; ModestAccountMgrPrivate *priv; @@ -213,299 +200,453 @@ modest_account_mgr_new (ModestConf * conf) 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)); + 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); +} - priv->current_accounts = modest_account_mgr_account_names (MODEST_ACCOUNT_MGR(obj), NULL); - g_signal_connect (G_OBJECT (conf), "key-changed", - G_CALLBACK (modest_account_mgr_check_change), obj); - return obj; +static const gchar * +null_means_empty (const gchar * str) +{ + return str ? str : ""; } gboolean -modest_account_mgr_add_account (ModestAccountMgr * self, const gchar * name, - const gchar * store_account, - const gchar * transport_account, - GError ** err) +modest_account_mgr_add_account (ModestAccountMgr *self, + const gchar *name, + const gchar *store_account, + const gchar *transport_account) { ModestAccountMgrPrivate *priv; gchar *key; - - 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 , * 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, TRUE); - 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); - key = get_account_keyname (name, NULL); - - retval = modest_conf_remove_key (priv->modest_conf, key, NULL); + + /* 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; + /* 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, "use_lsub"); + option_list = g_slist_append (option_list, "check_all"); + /* Security options */ + switch (security) { + case MODEST_PROTOCOL_SECURITY_NONE: + option_list = g_slist_append (option_list, "use_ssl=never"); + break; + case MODEST_PROTOCOL_SECURITY_SSL: + case MODEST_PROTOCOL_SECURITY_TLS: + option_list = g_slist_append (option_list, "use_ssl=always"); + break; + case MODEST_PROTOCOL_SECURITY_TLS_OP: + option_list = g_slist_append (option_list, "use_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); + } +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); - - /* TODO: check already exists */ - + g_return_val_if_fail (strchr(name, '/') == NULL, FALSE); + g_return_val_if_fail (uri, 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 already exists", name); - //g_free (acckey); - //return FALSE; - } - - /* hostname */ - key = g_strconcat (acckey, "/", MODEST_ACCOUNT_HOSTNAME, NULL); - modest_conf_set_string (priv->modest_conf, key, - null_means_empty (hostname), 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), 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); + 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); - /* password */ - if (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); - g_free (acckey); - 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; + 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); + 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); + } + return retval; } -/* strip the first /n/ character from each element */ -/* caller must make sure all elements are strings with + +/* 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 GSList * +static void strip_prefix_from_elements (GSList * lst, guint n) { - GSList *cursor = lst; - - while (cursor) { - gchar *str = (gchar *) cursor->data; - - cursor->data = g_strdup (str + n); - g_free (str); - cursor = cursor->next; + while (lst) { + memmove (lst->data, lst->data + n, + strlen(lst->data) - n + 1); + lst = lst->next; } - return lst; } -GSList * -modest_account_mgr_server_account_names (ModestAccountMgr * self, - const gchar * account_name, - ModestProtoType type, - const gchar * proto, - gboolean only_enabled) +GSList* +modest_account_mgr_search_server_accounts (ModestAccountMgr * self, + const gchar * account_name, + ModestProtocolType type, + ModestProtocol proto) { GSList *accounts; GSList *cursor; ModestAccountMgrPrivate *priv; - const size_t prefix_len = - strlen (MODEST_SERVER_ACCOUNT_NAMESPACE "/"); - + 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 strip_prefix_from_elements (accounts, prefix_len); - - /* 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 strip_prefix_from_elements (accounts, prefix_len); + + /* +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) +GSList* +modest_account_mgr_account_names (ModestAccountMgr * self) { 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); - return strip_prefix_from_elements (accounts, prefix_len); + 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; } -static gchar * -get_account_string (ModestAccountMgr * self, const gchar * name, - const gchar * key, gboolean server_account, GError ** err) { +gchar * +modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name, + 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); g_return_val_if_fail (key, NULL); - 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_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; @@ -513,319 +654,288 @@ get_account_string (ModestAccountMgr * self, const gchar * name, gchar * -modest_account_mgr_get_server_account_string (ModestAccountMgr * self, - const gchar * name, - const gchar * key, - GError ** err) +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); + 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); -} - -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, FALSE); - g_return_val_if_fail (name, 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); - if (server_account) - keyname = get_server_account_keyname (name, key); - else - keyname = get_account_keyname (name, key); - + 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; } -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); -} + 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); -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); + 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); - + keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); + 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_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) +gboolean +modest_account_mgr_set_int (ModestAccountMgr * self, const gchar * name, + 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); - 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_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_server_account_int (ModestAccountMgr * self, - const gchar * name, - const gchar * key, int val, - GError ** err) -{ - return set_account_int (self, name, key, val, TRUE, err); -} - 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); -} - - -static gboolean -set_account_bool (ModestAccountMgr * self, const gchar * name, - const gchar * key, gboolean server_account, gboolean val, - GError ** err) +modest_account_mgr_set_bool (ModestAccountMgr * self, const gchar * name, + 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); - 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_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; } gboolean -modest_account_mgr_set_server_account_bool (ModestAccountMgr * self, - const gchar * name, - const gchar * key, gboolean val, - GError ** err) +modest_account_mgr_set_list (ModestAccountMgr *self, + const gchar *name, + const gchar *key, + GSList *val, + ModestConfValueType list_type, + gboolean server_account) { - return set_account_bool (self, name, key, val, TRUE, err); -} + 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); + 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); -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 (MODEST_IS_ACCOUNT_MGR(self), FALSE); g_return_val_if_fail (name, FALSE); - if (server_account) - keyname = get_server_account_keyname (name, NULL); - else - keyname = get_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); - + 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) -{ - return account_exists (self, name, TRUE, err); -} - -gboolean -modest_account_mgr_account_exists (ModestAccountMgr * self, - const gchar * name, GError ** err) -{ - return account_exists (self, name, FALSE, err); -} - - -/* must be freed by caller */ -static gchar * -get_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_ACCOUNT_NAMESPACE, "/", - accname, "/", name, NULL); - else - return g_strconcat - (MODEST_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); -/* must be freed by caller */ -static gchar * -get_server_account_keyname (const gchar * accname, const gchar * name) -{ - if (name) - return g_strconcat - (MODEST_SERVER_ACCOUNT_NAMESPACE, "/", - accname, "/", name, NULL); - else - return g_strconcat - (MODEST_SERVER_ACCOUNT_NAMESPACE, "/", accname, NULL); + 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; }