X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=44d7421eeda87274df9959979f0294fc17495541;hp=76d042b17cef79d53c897c73b9224d218b2938e9;hb=d2766e0125d45ae66dbe70b51eb90e3b0e493982;hpb=203c13a878a174540019a9d558ef867b797805e1 diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c index 76d042b..44d7421 100644 --- a/src/modest-account-mgr.c +++ b/src/modest-account-mgr.c @@ -28,16 +28,15 @@ */ #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, gboolean server_account); +static void modest_account_mgr_init (ModestAccountMgr * obj); +static void modest_account_mgr_finalize (GObject * obj); /* list my signals */ enum { @@ -46,98 +45,91 @@ enum { 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 gchar* -account_from_key (const gchar *key, gboolean *is_account_key, gboolean *is_server_account) +/* We signal key changes in batches, every X seconds: */ +static gboolean +on_timeout_notify_changes (gpointer data) { - const gchar* account_ns = MODEST_ACCOUNT_NAMESPACE "/"; - const gchar* server_account_ns = MODEST_SERVER_ACCOUNT_NAMESPACE "/"; - gchar *cursor; - gchar *account = NULL; - - /* determine if it's an account or a server account, - * based on the prefix */ - if (g_str_has_prefix (key, account_ns)) { - - if (is_server_account) - *is_server_account = FALSE; + ModestAccountMgr *self = MODEST_ACCOUNT_MGR (data); + ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - account = g_strdup (key + strlen (account_ns)); - - } else if (g_str_has_prefix (key, server_account_ns)) { - - if (is_server_account) - *is_server_account = TRUE; - - account = g_strdup (key + strlen (server_account_ns)); - } else - return NULL; - - /* if there are any slashes left in the key, it's not - * the toplevel entry for an account - */ - cursor = strstr(account, "/"); + /* TODO: Also store the account names, and notify one list for each account, + * if anything uses the account names. */ - if (is_account_key && cursor) - *is_account_key = TRUE; - - /* put a NULL where the first slash was */ - if (cursor) - *cursor = '\0'; + if (priv->changed_conf_keys) { + gchar *default_account = + modest_account_mgr_get_default_account (self); + + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, + default_account, priv->changed_conf_keys, FALSE); + + g_free (default_account); - return account; + g_slist_foreach (priv->changed_conf_keys, (GFunc) g_free, NULL); + g_slist_free (priv->changed_conf_keys); + priv->changed_conf_keys = NULL; + } + + return TRUE; /* Call this again later. */ } - - - 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; + ModestAccountMgr *self = MODEST_ACCOUNT_MGR (user_data); + ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - 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) { + /* Get the default account instead. */ + + /* Store the key for later notification in our timeout callback. + * Notifying for every key change would cause unnecessary work: */ + priv->changed_conf_keys = g_slist_append (priv->changed_conf_keys, + (gpointer) g_strdup (key)); + } + + 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 = 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 */ + /* account was removed -- emit this, even if the account was + disabled. This should not happen unless the user directly + does it in gconf */ if (is_account_key && event == MODEST_CONF_EVENT_KEY_UNSET) { - g_signal_emit (G_OBJECT(self), signals[ACCOUNT_REMOVED_SIGNAL], 0, + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_REMOVED_SIGNAL], 0, account, is_server_account); g_free (account); return; } /* is this account enabled? */ - enabled = modest_account_mgr_account_is_enabled (self, account, - is_server_account); - - /* account was changed. - * and always notify when enabled/disabled changes + gboolean enabled = FALSE; + if (is_server_account) + enabled = TRUE; + else + enabled = modest_account_mgr_get_enabled (self, account); + + /* 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)) - g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, - account, key, is_server_account); + if (enabled || + g_str_has_suffix (key, MODEST_ACCOUNT_ENABLED) || + strcmp (key, MODEST_CONF_DEFAULT_ACCOUNT) == 0) { + /* Store the key for later notification in our timeout callback. + * Notifying for every key change would cause unnecessary work: */ + priv->changed_conf_keys = g_slist_append (NULL, + (gpointer) g_strdup (key)); + } g_free (account); } @@ -159,6 +151,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, @@ -172,8 +165,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); @@ -197,8 +188,8 @@ modest_account_mgr_class_init (ModestAccountMgrClass * 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); + modest_marshal_VOID__STRING_POINTER_BOOLEAN, + G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN); } @@ -209,19 +200,35 @@ modest_account_mgr_init (ModestAccountMgr * obj) MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); priv->modest_conf = NULL; + + priv->timeout = g_timeout_add (1000 /* milliseconds */, on_timeout_notify_changes, obj); } static void modest_account_mgr_finalize (GObject * obj) { - ModestAccountMgrPrivate *priv = + ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); + + if (priv->modest_conf) { + g_object_unref (G_OBJECT(priv->modest_conf)); + priv->modest_conf = NULL; + } - priv->modest_conf = NULL; + if (priv->timeout) + g_source_remove (priv->timeout); + + if (priv->changed_conf_keys) { + g_slist_foreach (priv->changed_conf_keys, (GFunc) g_free, NULL); + g_slist_free (priv->changed_conf_keys); + } + + 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; @@ -231,12 +238,14 @@ modest_account_mgr_new (ModestConf * conf) obj = G_OBJECT (g_object_new (MODEST_TYPE_ACCOUNT_MGR, NULL)); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); - 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 obj; + + return MODEST_ACCOUNT_MGR (obj); } @@ -247,148 +256,258 @@ null_means_empty (const gchar * str) } - -gboolean -modest_account_mgr_disable_account (ModestAccountMgr *self, const gchar* name, - gboolean is_server_account) -{ - return modest_account_mgr_set_bool (self, name, - MODEST_ACCOUNT_ENABLED, FALSE, - is_server_account, NULL); -} - - -gboolean -modest_account_mgr_enable_account (ModestAccountMgr *self, const gchar* name, - gboolean is_server_account) -{ - return modest_account_mgr_set_bool (self, name, - MODEST_ACCOUNT_ENABLED, TRUE, - is_server_account, NULL); -} - - -gboolean -modest_account_mgr_account_is_enabled (ModestAccountMgr *self, const gchar* name, - gboolean is_server_account) -{ - return modest_account_mgr_get_bool (self, name, - MODEST_ACCOUNT_ENABLED, is_server_account, - NULL); -} - - gboolean 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 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); - - if (modest_account_mgr_account_exists (self, name, FALSE, err)) { - g_printerr ("modest: account already exists\n"); - 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 = _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; + } - key = get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME, 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 = get_account_keyname (name, MODEST_ACCOUNT_STORE_ACCOUNT, FALSE); - ok = 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: Error adding store account conf: %s\n", err->message); + g_error_free (err); + } + return FALSE; } } - + if (transport_account) { - key = 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_enable_account (self, name, FALSE); + /* 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, - const gchar * username, - const gchar * password, - const gchar * proto) + const gchar * name, const gchar *hostname, + guint portnumber, + const gchar * username, const gchar * password, + ModestTransportStoreProtocol proto, + ModestConnectionProtocol security, + ModestAuthProtocol auth) { ModestAccountMgrPrivate *priv; gchar *key; - - g_return_val_if_fail (self, FALSE); + 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); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - - key = get_account_keyname (name, NULL, TRUE); - if (modest_conf_key_exists (priv->modest_conf, key, NULL)) { - g_printerr ("modest: server account '%s' already exists", name); + + /* 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); - return FALSE; + 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; - /* hostname */ - key = get_account_keyname (name, MODEST_ACCOUNT_HOSTNAME, TRUE); - modest_conf_set_string (priv->modest_conf, key, null_means_empty(hostname), NULL); + /* 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; - /* username */ - key = get_account_keyname (name, MODEST_ACCOUNT_USERNAME, TRUE); - modest_conf_set_string (priv->modest_conf, key, null_means_empty (username), 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_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; - /* password */ - key = get_account_keyname (name, MODEST_ACCOUNT_PASSWORD, TRUE); - modest_conf_set_string (priv->modest_conf, key, null_means_empty (password), NULL); + + /* 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 = get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE); - modest_conf_set_string (priv->modest_conf, key, null_means_empty (proto), NULL); + 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); - /* enable it */ - modest_account_mgr_enable_account (self, name, TRUE); + 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; } @@ -396,58 +515,101 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self, 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; } + /* Notify the observers. We need to do that here because they + could need to use the configuration keys before deleting + them, i.e., the account store will delete the cache. We + only notify about removals of modest accounts */ + if (!server_account) + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_REMOVED_SIGNAL], 0, + name, server_account); + + /* in case we're 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 = get_account_keyname (name, NULL, server_account); + 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); + + /* pick another one as the new default account */ + modest_account_mgr_set_first_account_as_default (self); + } 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 * +#if 0 +/* Not used. */ +GSList* modest_account_mgr_search_server_accounts (ModestAccountMgr * self, const gchar * account_name, - ModestProtoType type, - const gchar *proto, - gboolean only_enabled) + ModestTransportStoreProtocol proto) { GSList *accounts; GSList *cursor; @@ -457,113 +619,171 @@ modest_account_mgr_search_server_accounts (ModestAccountMgr * self, g_return_val_if_fail (self, NULL); - key = get_account_keyname (account_name, NULL, TRUE); + 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; } - /* no restrictions, return everything */ - if (type == MODEST_PROTO_TYPE_ANY && !proto) - return strip_prefix_from_elements (accounts, strlen(key)+1); - /* +1 because we must remove the ending '/' as well */ - - /* otherwise, filter out the none-matching ones */ + /* 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 *account; - gchar *acc_proto; - gboolean enabled; - - account = account_from_key ((gchar*)cursor->data, NULL, NULL); - - enabled = modest_account_mgr_account_is_enabled (self, account, TRUE); - acc_proto = modest_account_mgr_get_string (self, account, MODEST_ACCOUNT_PROTO, - TRUE, NULL); - 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? */ - (!enabled && only_enabled)) { /* account enabled? */ - /* 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); + 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; } else cursor = cursor->next; - + g_free (account); g_free (acc_proto); } - - return strip_prefix_from_elements (accounts, strlen(key)+1); + /* +1 because we must remove the ending '/' as well */ + strip_prefix_from_elements (accounts, strlen(key)+1); + return accounts; } +#endif - -GSList * -modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err) +GSList* +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); - 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); + + 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); g_return_val_if_fail (key, NULL); - keyname = get_account_keyname (name, key, server_account); + 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 = get_account_keyname (name, key, server_account); + 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; @@ -573,22 +793,59 @@ modest_account_mgr_get_int (ModestAccountMgr *self, const gchar *name, 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 = get_account_keyname (account, key, server_account); + 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; @@ -597,50 +854,66 @@ modest_account_mgr_get_bool (ModestAccountMgr * self, const gchar *account, 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); - keyname = get_account_keyname (name, key, server_account); + 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_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); - keyname = get_account_keyname (name, key, server_account); + 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; } @@ -649,70 +922,253 @@ modest_account_mgr_set_int (ModestAccountMgr * self, const gchar * name, 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); - keyname = get_account_keyname (name, key, server_account); + 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_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); + 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_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 = get_account_keyname (name, NULL, server_account); - + 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_account_with_display_name_exists (ModestAccountMgr *self, const gchar *display_name) +{ + 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 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; +} + + + + +gboolean +modest_account_mgr_unset (ModestAccountMgr *self, const gchar *name, + const gchar *key, gboolean server_account) +{ + 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; } +gchar* +_modest_account_mgr_account_from_key (const gchar *key, gboolean *is_account_key, gboolean *is_server_account) +{ + /* Initialize input parameters: */ + if (is_account_key) + *is_account_key = FALSE; + + if (is_server_account) + *is_server_account = FALSE; + + const gchar* account_ns = MODEST_ACCOUNT_NAMESPACE "/"; + const gchar* server_account_ns = MODEST_SERVER_ACCOUNT_NAMESPACE "/"; + gchar *cursor; + gchar *account = NULL; + + /* determine whether it's an account or a server account, + * based on the prefix */ + if (g_str_has_prefix (key, account_ns)) { + + if (is_server_account) + *is_server_account = FALSE; + + account = g_strdup (key + strlen (account_ns)); + + } else if (g_str_has_prefix (key, server_account_ns)) { + + if (is_server_account) + *is_server_account = TRUE; + + account = g_strdup (key + strlen (server_account_ns)); + } else + return NULL; + + /* if there are any slashes left in the key, it's not + * the toplevel entry for an account + */ + cursor = strstr(account, "/"); + + if (is_account_key && cursor) + *is_account_key = TRUE; + + /* put a NULL where the first slash was */ + if (cursor) + *cursor = '\0'; + + if (account) { + /* The key is an escaped string, so unescape it to get the actual account name: */ + gchar *unescaped_name = modest_conf_key_unescape (account); + g_free (account); + return unescaped_name; + } else + return NULL; +} + + /* must be freed by caller */ -static gchar * -get_account_keyname (const gchar * accname, const gchar * name, gboolean server_account) +gchar * +_modest_account_mgr_get_account_keyname (const gchar *account_name, const gchar * name, gboolean server_account) { - gchar *namespace, *account_name, *retval; + gchar *retval = NULL; - namespace = server_account ? MODEST_SERVER_ACCOUNT_NAMESPACE : MODEST_ACCOUNT_NAMESPACE; - - if (!accname) + gchar *namespace = server_account ? MODEST_SERVER_ACCOUNT_NAMESPACE : MODEST_ACCOUNT_NAMESPACE; + + if (!account_name) return g_strdup (namespace); - - account_name = modest_conf_key_escape (NULL, accname); - if (name) - retval = g_strconcat (namespace, "/", accname, "/", name, NULL); - else - retval = g_strconcat (namespace, "/", accname, NULL); + /* Always escape the conf keys, so that it is acceptable to gconf: */ + gchar *escaped_account_name = account_name ? modest_conf_key_escape (account_name) : NULL; + gchar *escaped_name = name ? modest_conf_key_escape (name) : NULL; + + if (escaped_account_name && escaped_name) + retval = g_strconcat (namespace, "/", escaped_account_name, "/", escaped_name, NULL); + else if (escaped_account_name) + retval = g_strconcat (namespace, "/", escaped_account_name, NULL); + + /* Sanity check: */ + if (!modest_conf_key_is_valid (retval)) { + g_warning ("%s: Generated conf key was invalid: %s", __FUNCTION__, retval); + g_free (retval); + retval = NULL; + } - g_free (account_name); + g_free (escaped_name); + g_free (escaped_account_name); return retval; } + +gboolean +modest_account_mgr_has_accounts (ModestAccountMgr* self, gboolean enabled) +{ + /* Check that at least one account exists: */ + GSList *account_names = modest_account_mgr_account_names (self, + enabled); + gboolean accounts_exist = account_names != NULL; + g_slist_free (account_names); + + return accounts_exist; +}