X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=85b4a8b5382ea45159f7e6c8f8bc852dc91c8438;hb=1551548a3d5c9b37abc65c660b03dc0be6a99932;hp=9cca65ecc123502a002374df64408e32c2bdc020;hpb=47b6bed5e41055dcffdbfdb9c989b49bf6500293;p=modest diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c index 9cca65e..85b4a8b 100644 --- a/src/modest-account-mgr.c +++ b/src/modest-account-mgr.c @@ -29,17 +29,15 @@ #include #include -#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); - /* list my signals */ enum { ACCOUNT_CHANGED_SIGNAL, @@ -47,63 +45,11 @@ enum { LAST_SIGNAL }; -typedef struct _ModestAccountMgrPrivate ModestAccountMgrPrivate; -struct _ModestAccountMgrPrivate { - ModestConf *modest_conf; - ModestProtocolMgr *proto_mgr; -}; -#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) -{ - 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'; - - return account; -} - - - - static void on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpointer user_data) { @@ -116,9 +62,20 @@ on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpoint self = MODEST_ACCOUNT_MGR (user_data); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - - account = account_from_key (key, &is_account_key, &is_server_account); + /* 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; @@ -135,12 +92,14 @@ on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpoint if (is_server_account) enabled = TRUE; else - enabled = modest_account_mgr_account_get_enabled (self, account); + enabled = modest_account_mgr_get_enabled (self, account); - /* account was changed. + /* 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)) + 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); @@ -213,7 +172,6 @@ modest_account_mgr_init (ModestAccountMgr * obj) MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); priv->modest_conf = NULL; - priv->proto_mgr = modest_protocol_mgr_new (); } static void @@ -227,14 +185,10 @@ modest_account_mgr_finalize (GObject * obj) priv->modest_conf = NULL; } - if (priv->proto_mgr) { - g_object_unref (G_OBJECT(priv->proto_mgr)); - priv->proto_mgr = NULL; - } - G_OBJECT_CLASS(parent_class)->finalize (obj); } + ModestAccountMgr * modest_account_mgr_new (ModestConf * conf) { @@ -265,25 +219,6 @@ null_means_empty (const gchar * str) gboolean -modest_account_mgr_account_set_enabled (ModestAccountMgr *self, const gchar* name, - gboolean enabled) -{ - return modest_account_mgr_set_bool (self, name, - MODEST_ACCOUNT_ENABLED, enabled, - FALSE, NULL); -} - - -gboolean -modest_account_mgr_account_get_enabled (ModestAccountMgr *self, const gchar* name) -{ - return modest_account_mgr_get_bool (self, name, - MODEST_ACCOUNT_ENABLED, FALSE, - NULL); -} - - -gboolean modest_account_mgr_add_account (ModestAccountMgr *self, const gchar *name, const gchar *store_account, @@ -293,7 +228,8 @@ modest_account_mgr_add_account (ModestAccountMgr *self, ModestAccountMgrPrivate *priv; gchar *key; gboolean ok; - + gchar *default_account; + g_return_val_if_fail (self, FALSE); g_return_val_if_fail (name, FALSE); g_return_val_if_fail (strchr(name, '/') == NULL, FALSE); @@ -304,7 +240,7 @@ modest_account_mgr_add_account (ModestAccountMgr *self, * we create the account by adding an account 'dir', with the name , * and in that the 'display_name' string key */ - key = get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME, FALSE); + key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME, FALSE); if (modest_account_mgr_account_exists (self, key, FALSE, err)) { g_printerr ("modest: account already exists\n"); g_free (key); @@ -313,14 +249,13 @@ modest_account_mgr_add_account (ModestAccountMgr *self, ok = modest_conf_set_string (priv->modest_conf, key, name, err); g_free (key); - if (!ok) { g_printerr ("modest: cannot set display name\n"); return FALSE; } if (store_account) { - key = get_account_keyname (name, MODEST_ACCOUNT_STORE_ACCOUNT, FALSE); + 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) { @@ -331,7 +266,7 @@ modest_account_mgr_add_account (ModestAccountMgr *self, } if (transport_account) { - key = get_account_keyname (name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, FALSE); + 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) { @@ -340,8 +275,13 @@ modest_account_mgr_add_account (ModestAccountMgr *self, return FALSE; } } + modest_account_mgr_set_enabled (self, name, TRUE); - modest_account_mgr_account_set_enabled (self, name, TRUE); + /* 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; } @@ -353,19 +293,24 @@ gboolean modest_account_mgr_add_server_account (ModestAccountMgr * self, const gchar * name, const gchar *hostname, const gchar * username, const gchar * password, - const gchar * proto) + ModestProtocol proto) { ModestAccountMgrPrivate *priv; gchar *key; - + ModestProtocolType proto_type; + g_return_val_if_fail (self, FALSE); g_return_val_if_fail (name, FALSE); g_return_val_if_fail (strchr(name, '/') == NULL, FALSE); + proto_type = modest_protocol_info_get_protocol_type (proto); + g_return_val_if_fail (proto_type == MODEST_PROTOCOL_TYPE_TRANSPORT || + proto_type == MODEST_PROTOCOL_TYPE_STORE, FALSE); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); /* hostname */ - key = get_account_keyname (name, MODEST_ACCOUNT_HOSTNAME, TRUE); + key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_HOSTNAME, TRUE); if (modest_conf_key_exists (priv->modest_conf, key, NULL)) { g_printerr ("modest: server account '%s' already exists", name); g_free (key); @@ -376,20 +321,53 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self, g_free (key); /* username */ - key = get_account_keyname (name, MODEST_ACCOUNT_USERNAME, TRUE); + key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_USERNAME, TRUE); modest_conf_set_string (priv->modest_conf, key, null_means_empty (username), NULL); g_free (key); /* password */ - key = get_account_keyname (name, MODEST_ACCOUNT_PASSWORD, TRUE); + key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PASSWORD, TRUE); modest_conf_set_string (priv->modest_conf, key, null_means_empty (password), NULL); g_free (key); /* 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); + modest_conf_set_string (priv->modest_conf, key, + modest_protocol_info_get_protocol_name(proto), + NULL); + g_free (key); + + return TRUE; +} + + +gboolean +modest_account_mgr_add_server_account_uri (ModestAccountMgr * self, + const gchar *name, ModestProtocol proto, + const gchar *uri) +{ + ModestAccountMgrPrivate *priv; + gchar *key; + + g_return_val_if_fail (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); + modest_conf_set_string (priv->modest_conf, key, + modest_protocol_info_get_protocol_name(proto), NULL); g_free (key); + /* uri */ + key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_URI, TRUE); + modest_conf_set_string (priv->modest_conf, key, uri, NULL); + g_free (key); + return TRUE; } @@ -414,7 +392,7 @@ modest_account_mgr_remove_account (ModestAccountMgr * self, } 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, NULL); @@ -429,22 +407,22 @@ modest_account_mgr_remove_account (ModestAccountMgr * self, * length >= n, and also that data can be freed. * change is in-place */ -void +static void strip_prefix_from_elements (GSList * lst, guint n) { while (lst) { - memmove (lst->data + n, lst->data, - strlen(lst->data) + 1); + memmove (lst->data, lst->data + n, + strlen(lst->data) - n + 1); lst = lst->next; } } -GSList * +GSList* modest_account_mgr_search_server_accounts (ModestAccountMgr * self, const gchar * account_name, ModestProtocolType type, - const gchar *proto) + ModestProtocol proto) { GSList *accounts; GSList *cursor; @@ -454,7 +432,14 @@ modest_account_mgr_search_server_accounts (ModestAccountMgr * self, g_return_val_if_fail (self, NULL); - key = get_account_keyname (account_name, NULL, TRUE); + 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 */ @@ -465,47 +450,36 @@ modest_account_mgr_search_server_accounts (ModestAccountMgr * self, return NULL; } - /* no restrictions, return everything */ - if (type == MODEST_PROTOCOL_TYPE_ANY && !proto) { - strip_prefix_from_elements (accounts, strlen(key)+1); - return accounts; - /* +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; - - account = account_from_key ((gchar*)cursor->data, NULL, NULL); - acc_proto = modest_account_mgr_get_string (self, account, MODEST_ACCOUNT_PROTO, - TRUE, NULL); - if ((!acc_proto) || /* proto not defined? */ - (type != MODEST_PROTOCOL_TYPE_ANY && /* proto type ... */ - !modest_protocol_mgr_protocol_is_valid (priv->proto_mgr, - acc_proto,type)) || /* ... matches? */ - (proto && strcmp (proto, acc_proto) != 0)) { /* proto matches? */ - /* 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, NULL); + ModestProtocol this_proto = modest_protocol_info_get_protocol (acc_proto); + ModestProtocolType this_type = modest_protocol_info_get_protocol_type (this_proto); + + if ((this_type != MODEST_PROTOCOL_TYPE_UNKNOWN && this_type != type) || + (this_proto != MODEST_PROTOCOL_UNKNOWN && this_proto != proto)) { GSList *nxt = cursor->next; accounts = g_slist_delete_link (accounts, cursor); cursor = nxt; } else cursor = cursor->next; - + g_free (account); g_free (acc_proto); } - + /* +1 because we must remove the ending '/' as well */ strip_prefix_from_elements (accounts, strlen(key)+1); - - return accounts; - + return accounts; } -GSList * +GSList* modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err) { GSList *accounts; @@ -524,117 +498,6 @@ modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err) } -static ModestServerAccountData* -modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name) -{ - ModestServerAccountData *data; - - g_return_val_if_fail (modest_account_mgr_account_exists (self, name, - TRUE, NULL), NULL); - data = g_new0 (ModestServerAccountData, 1); - - data->account_name = g_strdup (name); - data->hostname = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_HOSTNAME, - TRUE, NULL); - data->username = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_USERNAME, - TRUE, NULL); - data->proto = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_PROTO, - TRUE, NULL); - data->password = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_PASSWORD, - TRUE, NULL); - return data; -} - - -static void -modest_account_mgr_free_server_account_data (ModestAccountMgr *self, - ModestServerAccountData* data) -{ - g_return_if_fail (self); - - if (!data) - return; /* not an error */ - - g_free (data->account_name); - g_free (data->hostname); - g_free (data->username); - g_free (data->proto); - g_free (data->password); - - g_free (data); -} - - -ModestAccountData* -modest_account_mgr_get_account_data (ModestAccountMgr *self, const gchar* name) -{ - ModestAccountData *data; - gchar *server_account; - - g_return_val_if_fail (self, NULL); - g_return_val_if_fail (name, NULL); - g_return_val_if_fail (modest_account_mgr_account_exists (self, name, - FALSE, NULL), NULL); - data = g_new0 (ModestAccountData, 1); - - data->account_name = g_strdup (name); - data->full_name = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_FULLNAME, - FALSE, NULL); - data->email = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_EMAIL, - FALSE, NULL); - data->enabled = modest_account_mgr_account_get_enabled (self, name); - - /* store */ - server_account = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_STORE_ACCOUNT, - FALSE, NULL); - if (server_account) { - data->store_account = - modest_account_mgr_get_server_account_data (self, - server_account); - g_free (server_account); - } - - /* transport */ - server_account = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_TRANSPORT_ACCOUNT, - FALSE, NULL); - if (server_account) { - data->transport_account = - modest_account_mgr_get_server_account_data (self, - server_account); - g_free (server_account); - } - - return data; -} - - -void -modest_account_mgr_free_account_data (ModestAccountMgr *self, ModestAccountData *data) -{ - g_return_if_fail (self); - - if (!data) - return; - - g_free (data->account_name); - g_free (data->full_name); - g_free (data->email); - - modest_account_mgr_free_server_account_data (self, data->store_account); - modest_account_mgr_free_server_account_data (self, data->transport_account); - - g_free (data); -} - - gchar * modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name, const gchar *key, gboolean server_account, GError **err) { @@ -648,7 +511,7 @@ modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name, 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); @@ -671,7 +534,7 @@ modest_account_mgr_get_int (ModestAccountMgr *self, const gchar *name, 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); @@ -695,7 +558,7 @@ modest_account_mgr_get_bool (ModestAccountMgr * self, const gchar *account, 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); @@ -720,7 +583,7 @@ modest_account_mgr_set_string (ModestAccountMgr * self, const gchar * name, 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); @@ -746,7 +609,7 @@ modest_account_mgr_set_int (ModestAccountMgr * self, const gchar * name, 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); @@ -772,7 +635,7 @@ modest_account_mgr_set_bool (ModestAccountMgr * self, const gchar * name, 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); @@ -782,6 +645,29 @@ modest_account_mgr_set_bool (ModestAccountMgr * self, const gchar * name, return retval; } +void +modest_account_mgr_set_list (ModestAccountMgr *self, + const gchar *name, + const gchar *key, + GSList *val, + ModestConfValueType list_type, + gboolean server_account, + GError **err) +{ + ModestAccountMgrPrivate *priv; + gchar *keyname; + + g_return_if_fail (self); + g_return_if_fail (name); + g_return_if_fail (key); + g_return_if_fail (val); + + keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); + + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + modest_conf_set_list (priv->modest_conf, keyname, val, list_type, err); + g_free (keyname); +} gboolean modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name, @@ -795,7 +681,7 @@ modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name, g_return_val_if_fail (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); @@ -822,7 +708,7 @@ modest_account_mgr_get_list (ModestAccountMgr *self, 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_list (priv->modest_conf, keyname, list_type, err); @@ -848,7 +734,7 @@ modest_account_mgr_unset (ModestAccountMgr *self, 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_remove_key (priv->modest_conf, keyname, err); @@ -856,39 +742,3 @@ modest_account_mgr_unset (ModestAccountMgr *self, g_free (keyname); return retval; } - - - -/* must be freed by caller */ -static gchar * -get_account_keyname (const gchar *account_name, const gchar * name, gboolean server_account) -{ - gchar *namespace; - gchar *retval; - - namespace = server_account ? MODEST_SERVER_ACCOUNT_NAMESPACE : MODEST_ACCOUNT_NAMESPACE; - - if (!account_name) - return g_strdup (namespace); - - if (name) - retval = g_strconcat (namespace, "/", account_name, "/", name, NULL); - else - retval = g_strconcat (namespace, "/", account_name, NULL); - - /* special case: the key has some weird characters */ - if (!modest_conf_key_is_valid (retval)) { - - gchar *account_name_esc, *name_esc; - g_free (retval); - - account_name_esc = account_name ? modest_conf_key_escape (account_name) : NULL; - name_esc = name ? modest_conf_key_escape (name) : NULL; - - retval = get_account_keyname (account_name_esc, name_esc, server_account); - - g_free (account_name_esc); - g_free (name_esc); - } - return retval; -}