return modest_account_mgr_get_bool (self, name, MODEST_ACCOUNT_ENABLED, FALSE);
}
-static gint
-compare_option_strings_for_name (const gchar* a, const gchar* b)
+gboolean modest_account_mgr_set_signature (ModestAccountMgr *self, const gchar* name,
+ const gchar* signature, gboolean use_signature)
{
- /* printf(" debug: compare_option_strings_for_name():a=%s, b=%s\n", a, b); */
- const gchar* sep = strchr(a, '=');
- if (!sep)
- return -1;
-
- gint len = sep - a;
- if(len <= 0)
- return -1;
+ gboolean result = modest_account_mgr_set_bool (self, name, MODEST_ACCOUNT_USE_SIGNATURE,
+ use_signature, FALSE);
+ result = result && modest_account_mgr_set_string (self, name, MODEST_ACCOUNT_SIGNATURE,
+ signature, FALSE);
+ return result;
+}
+
+gchar* modest_account_mgr_get_display_name (ModestAccountMgr *self,
+ const gchar* name)
+{
+ return modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_DISPLAY_NAME, FALSE);
+}
+
+
+
+gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* name,
+ gboolean* use_signature)
+{
+ if (use_signature) {
+ *use_signature =
+ modest_account_mgr_get_bool (self, name, MODEST_ACCOUNT_USE_SIGNATURE, FALSE);
+ }
+
+ return modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SIGNATURE, FALSE);
+}
+
+
+gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self,
+ const gchar* account_name,
+ const gchar* connection_name, const gchar* server_account_name)
+{
+ modest_account_mgr_remove_connection_specific_smtp (self, account_name, connection_name);
+
+ GSList *list = modest_account_mgr_get_list (self, account_name,
+ MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
+ MODEST_CONF_VALUE_STRING, FALSE);
- /* Get the part of the string before the =.
- * Note that this allocation is inefficient just so we can do a strcmp. */
- gchar* name = g_malloc (len+1);
- memcpy(name, a, len);
- name[len] = 0; /* Null-termination. */
+ /* The server account is in the item after the connection name: */
+ GSList *list_connection = g_slist_append (list, (gpointer)connection_name);
+ list_connection = g_slist_append (list_connection, (gpointer)server_account_name);
- /* printf(" debug: name=%s\n", name); */
+ /* Reset the changed list: */
+ modest_account_mgr_set_list (self, account_name,
+ MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list_connection,
+ MODEST_CONF_VALUE_STRING, FALSE);
+
+ /* TODO: Should we free the items too, or just the list? */
+ g_slist_free (list);
+
+ return TRUE;
+}
- gint result = strcmp (name, b);
+/**
+ * modest_account_mgr_remove_connection_specific_smtp
+ * @self: a ModestAccountMgr instance
+ * @name: the account name
+ * @connection_name: A libconic IAP connection name
+ *
+ * Disassacoiate a server account to use with the specific connection for this account.
+ *
+ * Returns: TRUE if it worked, FALSE otherwise
+ */
+gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *self,
+ const gchar* account_name, const gchar* connection_name)
+{
+ GSList *list = modest_account_mgr_get_list (self, account_name,
+ MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
+ MODEST_CONF_VALUE_STRING, FALSE);
+ if (!list)
+ return FALSE;
+
+ /* The server account is in the item after the connection name: */
+ GSList *list_connection = g_slist_find_custom (list, connection_name, (GCompareFunc)strcmp);
+ if (list_connection) {
+ /* remove both items: */
+ GSList *temp = g_slist_delete_link(list_connection, list_connection);
+ temp = g_slist_delete_link(temp, g_slist_next(temp));
+ }
- g_free (name);
+ /* Reset the changed list: */
+ modest_account_mgr_set_list (self, account_name,
+ MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list,
+ MODEST_CONF_VALUE_STRING, FALSE);
+
+ /* TODO: Should we free the items too, or just the list? */
+ g_slist_free (list);
- return result;
+ return TRUE;
}
-
-gchar*
-modest_server_account_data_get_option_value (GSList* options_list, const gchar* option_name)
+
+gboolean modest_account_mgr_get_has_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_name)
{
- if (!options_list)
- return NULL;
+ GSList *list = modest_account_mgr_get_list (self, account_name,
+ MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
+ MODEST_CONF_VALUE_STRING, FALSE);
+ if (!list)
+ return FALSE;
+ /* TODO: Should we free the items too, or just the list? */
+ g_slist_free (list);
+
+ return TRUE;
+}
+
+/**
+ * modest_account_mgr_get_connection_specific_smtp
+ * @self: a ModestAccountMgr instance
+ * @name: the account name
+ * @connection_name: A libconic IAP connection name
+ *
+ * Retrieve a server account to use with this specific connection for this account.
+ *
+ * Returns: a server account name to use for this connection, or NULL if none is specified.
+ */
+gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_name,
+ const gchar* connection_name)
+{
gchar *result = NULL;
- GSList* option = g_slist_find_custom(options_list, option_name, (GCompareFunc)compare_option_strings_for_name);
- if(option) {
- /* Get the value part of the key=value pair: */
- const gchar* pair = (const gchar*)option->data;
-
- const gchar* sep = strchr(pair, '=');
- if (sep) {
- gint len = sep - pair;
- if(len > 0) {
- result = g_strdup(sep+1);
-
- /* Avoid returning an empty string instead of NULL. */
- if(result && strlen(result) == 0) {
- g_free(result);
- result = NULL;
+
+ GSList *list = modest_account_mgr_get_list (self, account_name,
+ MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
+ MODEST_CONF_VALUE_STRING, FALSE);
+ if (!list)
+ return NULL;
+
+ /* The server account is in the item after the connection name: */
+ GSList *iter = list;
+ while (iter) {
+ const gchar* this_connection_name = (const gchar*)(iter->data);
+ if (strcmp (this_connection_name, connection_name) == 0) {
+ iter = g_slist_next (iter);
+
+ if (iter) {
+ const gchar* account_name = (const gchar*)(iter->data);
+ if (account_name) {
+ result = g_strdup (account_name);
+ break;
}
}
}
+
+ /* Skip 2 to go to the next connection in the list: */
+ iter = g_slist_next (iter);
+ if (iter)
+ iter = g_slist_next (iter);
}
+ /*
+ if (!result) {
+ printf (" debug: no server found for connection_name=%s.\n", connection_name);
+ }
+ */
+
+ /* TODO: Should we free the items too, or just the list? */
+ g_slist_free (list);
+
return result;
}
+
+gchar*
+modest_server_account_get_username (ModestAccountMgr *self, const gchar* account_name)
+{
+ return modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_USERNAME,
+ TRUE /* server account */);
+}
-gboolean
-modest_server_account_data_get_option_bool (GSList* options_list, const gchar* option_name)
+void
+modest_server_account_set_username (ModestAccountMgr *self, const gchar* account_name,
+ const gchar* username)
{
- if (!options_list)
- return FALSE;
+ /* Note that this won't work properly as long as the gconf cache is broken
+ * in Maemo Bora: */
+ gchar *existing_username = modest_server_account_get_username(self,
+ account_name);
- gboolean result = FALSE;
- GSList* option = g_slist_find_custom(options_list, option_name, (GCompareFunc)strcmp);
- if(option) {
- return TRUE;
- }
+ modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_USERNAME,
+ username, TRUE /* server account */);
- return result;
+ /* We don't know anything about new usernames: */
+ if (strcmp (existing_username, username) != 0)
+ modest_server_account_set_username_has_succeeded (self,
+ account_name, FALSE);
+
+ g_free (existing_username);
}
-ModestProtocol
-modest_server_account_data_get_option_secure_auth (ModestServerAccountData *account_data)
+gboolean
+modest_server_account_get_username_has_succeeded (ModestAccountMgr *self, const gchar* account_name)
+{
+ return modest_account_mgr_get_bool (self, account_name, MODEST_ACCOUNT_USERNAME_HAS_SUCCEEDED,
+ TRUE /* server account */);
+}
+
+void
+modest_server_account_set_username_has_succeeded (ModestAccountMgr *self, const gchar* account_name,
+ gboolean succeeded)
{
- ModestProtocol result = MODEST_PROTOCOL_AUTH_NONE;
- gchar* value = modest_server_account_data_get_option_value (account_data->options,
- MODEST_ACCOUNT_OPTION_SECURE_AUTH);
+ modest_account_mgr_set_bool (self, account_name, MODEST_ACCOUNT_USERNAME_HAS_SUCCEEDED,
+ succeeded, TRUE /* server account */);
+}
+
+void
+modest_server_account_set_password (ModestAccountMgr *self, const gchar* account_name,
+ const gchar* password)
+{
+ modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PASSWORD,
+ password, TRUE /* server account */);
+}
+
+gchar*
+modest_server_account_get_hostname (ModestAccountMgr *self, const gchar* account_name)
+{
+ return modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_HOSTNAME,
+ TRUE /* server account */);
+}
+
+
+static ModestAuthProtocol
+get_secure_auth_for_conf_string(const gchar* value)
+{
+ ModestAuthProtocol result = MODEST_PROTOCOL_AUTH_NONE;
if (value) {
- if (strcmp(value, MODEST_ACCOUNT_OPTION_SECURE_AUTH_VALUE_NONE) == 0)
+ if (strcmp(value, MODEST_ACCOUNT_AUTH_MECH_VALUE_NONE) == 0)
result = MODEST_PROTOCOL_AUTH_NONE;
- else if (strcmp(value, MODEST_ACCOUNT_OPTION_SECURE_AUTH_VALUE_PASSWORD) == 0)
+ else if (strcmp(value, MODEST_ACCOUNT_AUTH_MECH_VALUE_PASSWORD) == 0)
result = MODEST_PROTOCOL_AUTH_PASSWORD;
- else if (strcmp(value, MODEST_ACCOUNT_OPTION_SECURE_AUTH_VALUE_CRAMMD5) == 0)
+ else if (strcmp(value, MODEST_ACCOUNT_AUTH_MECH_VALUE_CRAMMD5) == 0)
result = MODEST_PROTOCOL_AUTH_CRAMMD5;
+ }
+
+ return result;
+}
+
+ModestAuthProtocol
+modest_server_account_get_secure_auth (ModestAccountMgr *self,
+ const gchar* account_name)
+{
+ ModestAuthProtocol result = MODEST_PROTOCOL_AUTH_NONE;
+ gchar* value = modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_AUTH_MECH,
+ TRUE /* server account */);
+ if (value) {
+ result = get_secure_auth_for_conf_string (value);
g_free (value);
}
return result;
}
+
void
-modest_server_account_set_option_secure_auth (ModestAccountMgr *self,
- const gchar* account_name, ModestProtocol secure_auth)
-{
- GSList *options_list = modest_account_mgr_get_list (self, account_name, MODEST_ACCOUNT_OPTIONS,
- MODEST_CONF_VALUE_STRING, TRUE);
- if(options_list) {
- /* Remove the item if it exists already: */
- GSList* option = NULL;
- do {
- option = g_slist_find_custom(options_list, MODEST_ACCOUNT_OPTION_SECURE_AUTH, (GCompareFunc)compare_option_strings_for_name);
- if(option)
- options_list = g_slist_remove (options_list, option->data);
- } while (option);
- }
-
- /* Add the new item to the list: */
+modest_server_account_set_secure_auth (ModestAccountMgr *self,
+ const gchar* account_name, ModestAuthProtocol secure_auth)
+{
+ /* Get the conf string for the enum value: */
const gchar* str_value = NULL;
if (secure_auth == MODEST_PROTOCOL_AUTH_NONE)
- str_value = MODEST_ACCOUNT_OPTION_SECURE_AUTH_VALUE_NONE;
+ str_value = MODEST_ACCOUNT_AUTH_MECH_VALUE_NONE;
else if (secure_auth == MODEST_PROTOCOL_AUTH_PASSWORD)
- str_value = MODEST_ACCOUNT_OPTION_SECURE_AUTH_VALUE_PASSWORD;
+ str_value = MODEST_ACCOUNT_AUTH_MECH_VALUE_PASSWORD;
else if (secure_auth == MODEST_PROTOCOL_AUTH_CRAMMD5)
- str_value = MODEST_ACCOUNT_OPTION_SECURE_AUTH_VALUE_CRAMMD5;
-
- if (str_value) {
- gchar* pair = g_strdup_printf(MODEST_ACCOUNT_OPTION_SECURE_AUTH "=%s", str_value);
- options_list = g_slist_append(options_list, pair);
- }
+ str_value = MODEST_ACCOUNT_AUTH_MECH_VALUE_CRAMMD5;
/* Set it in the configuration: */
- modest_account_mgr_set_list (self, account_name, MODEST_ACCOUNT_OPTIONS, options_list,
- MODEST_CONF_VALUE_STRING, TRUE);
+ modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_AUTH_MECH, str_value, TRUE);
+}
+
+static ModestConnectionProtocol
+get_security_for_conf_string(const gchar* value)
+{
+ ModestConnectionProtocol result = MODEST_PROTOCOL_CONNECTION_NORMAL;
+ if (value) {
+ if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_NONE) == 0)
+ result = MODEST_PROTOCOL_CONNECTION_NORMAL;
+ else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_NORMAL) == 0) {
+ /* The UI has "Normal (TLS)": */
+ result = MODEST_PROTOCOL_CONNECTION_TLS;
+ } else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_SSL) == 0)
+ result = MODEST_PROTOCOL_CONNECTION_SSL;
+ }
- /* TODO: Should we free the items too, or just the list? */
- g_slist_free (options_list);
+ return result;
}
-ModestProtocol
-modest_server_account_data_get_option_security (ModestServerAccountData *account_data)
+ModestConnectionProtocol
+modest_server_account_get_security (ModestAccountMgr *self,
+ const gchar* account_name)
{
- ModestProtocol result = MODEST_PROTOCOL_SECURITY_NONE;
- gchar* value = modest_server_account_data_get_option_value (account_data->options,
- MODEST_ACCOUNT_OPTION_SECURITY);
+ ModestConnectionProtocol result = MODEST_PROTOCOL_CONNECTION_NORMAL;
+ gchar* value = modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_SECURITY,
+ TRUE /* server account */);
if (value) {
- if (strcmp(value, MODEST_ACCOUNT_OPTION_SECURITY_VALUE_NONE) == 0)
- result = MODEST_PROTOCOL_SECURITY_NONE;
- else if (strcmp(value, MODEST_ACCOUNT_OPTION_SECURITY_VALUE_NORMAL) == 0)
- result = MODEST_PROTOCOL_SECURITY_TLS;
- else if (strcmp(value, MODEST_ACCOUNT_OPTION_SECURITY_VALUE_SSL) == 0)
- result = MODEST_PROTOCOL_SECURITY_SSL;
+ result = get_security_for_conf_string (value);
g_free (value);
}
}
void
-modest_server_account_set_option_security (ModestAccountMgr *self,
- const gchar* account_name, ModestProtocol security)
-{
- GSList *options_list = modest_account_mgr_get_list (self, account_name, MODEST_ACCOUNT_OPTIONS,
- MODEST_CONF_VALUE_STRING, TRUE);
-
- if(options_list) {
- /* Remove the item if it exists already: */
- GSList* option = NULL;
- do {
- g_slist_find_custom(options_list, MODEST_ACCOUNT_OPTION_SECURITY, (GCompareFunc)compare_option_strings_for_name);
- if(option)
- options_list = g_slist_remove (options_list, option->data);
- } while(option);
- }
-
- /* Add the new item to the list: */
+modest_server_account_set_security (ModestAccountMgr *self,
+ const gchar* account_name, ModestConnectionProtocol security)
+{
+ /* Get the conf string for the enum value: */
const gchar* str_value = NULL;
- if (security == MODEST_PROTOCOL_SECURITY_NONE)
- str_value = MODEST_ACCOUNT_OPTION_SECURITY_VALUE_NONE;
- else if (security == MODEST_PROTOCOL_SECURITY_TLS)
- str_value = MODEST_ACCOUNT_OPTION_SECURITY_VALUE_NORMAL;
- else if (security == MODEST_PROTOCOL_SECURITY_SSL)
- str_value = MODEST_ACCOUNT_OPTION_SECURITY_VALUE_SSL;
-
- if (str_value) {
- gchar* pair = g_strdup_printf(MODEST_ACCOUNT_OPTION_SECURITY "=%s", str_value);
- options_list = g_slist_append(options_list, pair);
- }
+ if (security == MODEST_PROTOCOL_CONNECTION_NORMAL)
+ str_value = MODEST_ACCOUNT_SECURITY_VALUE_NONE;
+ else if (security == MODEST_PROTOCOL_CONNECTION_TLS) {
+ /* The UI has "Normal (TLS)": */
+ str_value = MODEST_ACCOUNT_SECURITY_VALUE_NORMAL;
+ } else if (security == MODEST_PROTOCOL_CONNECTION_SSL)
+ str_value = MODEST_ACCOUNT_SECURITY_VALUE_SSL;
/* Set it in the configuration: */
- modest_account_mgr_set_list (self, account_name, MODEST_ACCOUNT_OPTIONS, options_list,
- MODEST_CONF_VALUE_STRING, TRUE);
-
- /* TODO: Should we free the items too, or just the list? */
- g_slist_free (options_list);
-}
-
-gchar*
-modest_account_mgr_get_server_account_option (ModestAccountMgr *self,
- const gchar* account_name, const gchar* option_name)
-{
- GSList *option_list = modest_account_mgr_get_list (self, account_name, MODEST_ACCOUNT_OPTIONS,
- MODEST_CONF_VALUE_STRING, TRUE);
- if (!option_list)
- return NULL;
-
- gchar *result = modest_server_account_data_get_option_value (option_list, option_name);
-
- /* TODO: Should we free the items too, or just the list? */
- g_slist_free (option_list);
-
- return result;
+ modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_SECURITY, str_value, TRUE);
}
-static ModestServerAccountData*
+ModestServerAccountData*
modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name)
{
ModestServerAccountData *data;
data->hostname = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_HOSTNAME,TRUE);
data->username = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_USERNAME,TRUE);
proto = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, TRUE);
- data->proto = modest_protocol_info_get_protocol (proto);
+ data->proto = modest_protocol_info_get_transport_store_protocol (proto);
g_free (proto);
+ data->port = modest_account_mgr_get_int (self, name, MODEST_ACCOUNT_PORT, TRUE);
+
+ gchar *secure_auth_str = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_AUTH_MECH, TRUE);
+ data->secure_auth = get_secure_auth_for_conf_string(secure_auth_str);
+ g_free (secure_auth_str);
+
+ gchar *security_str = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SECURITY, TRUE);
+ data->security = get_security_for_conf_string(security_str);
+ g_free (security_str);
+
data->last_updated = modest_account_mgr_get_int (self, name, MODEST_ACCOUNT_LAST_UPDATED,TRUE);
- data->password = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PASSWORD, TRUE);
- data->uri = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_URI,TRUE);
- data->options = modest_account_mgr_get_list (self, name, MODEST_ACCOUNT_OPTIONS,
- MODEST_CONF_VALUE_STRING, TRUE);
+ data->password = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PASSWORD, TRUE);
+
return data;
}
-static void
+void
modest_account_mgr_free_server_account_data (ModestAccountMgr *self,
ModestServerAccountData* data)
{
g_free (data->password);
data->password = NULL;
-
- if (data->options) {
- GSList *tmp = data->options;
- while (tmp) {
- g_free (tmp->data);
- tmp = g_slist_next (tmp);
- }
- g_slist_free (data->options);
- }
g_slice_free (ModestServerAccountData, data);
}
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);
+
+ if (!modest_account_mgr_account_exists (self, name, FALSE)) {
+ /* For instance, maybe you are mistakenly checking for a server account name? */
+ g_warning ("%s: Account %s does not exist.", __FUNCTION__, name);
+ return NULL;
+ }
+
data = g_slice_new0 (ModestAccountData);
data->account_name = g_strdup (name);
return NULL;
}
- /* it's not really an error if there is no default account */
- if (!account)
- return NULL;
-
/* sanity check */
- if (!modest_account_mgr_account_exists (self, account, FALSE)) {
+ if (account && !modest_account_mgr_account_exists (self, account, FALSE)) {
g_printerr ("modest: default account does not exist\n");
g_free (account);
return NULL;
FALSE);
conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf;
-
+
return modest_conf_set_string (conf, MODEST_CONF_DEFAULT_ACCOUNT,
account, NULL);
}
+gboolean
+modest_account_mgr_unset_default_account (ModestAccountMgr *self)
+{
+ ModestConf *conf;
+
+ g_return_val_if_fail (self, FALSE);
+
+ conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf;
+
+ return modest_conf_remove_key (conf, MODEST_CONF_DEFAULT_ACCOUNT, NULL /* err */);
+
+}
+
+gint on_accounts_list_sort_by_title(gconstpointer a, gconstpointer b)
+{
+ return g_utf8_collate((const gchar*)a, (const gchar*)b);
+}
+
+gboolean
+modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self)
+{
+ gboolean result = FALSE;
+ GSList *account_names = modest_account_mgr_account_names (self, TRUE /* only enabled */);
+
+ /* Return TRUE if there is no account */
+ if (!account_names)
+ return TRUE;
+
+ /* Get the first one, alphabetically, by title: */
+ GSList* list_sorted = g_slist_sort (account_names,
+ on_accounts_list_sort_by_title);
+ if(list_sorted) {
+ const gchar* account_name = (const gchar*)list_sorted->data;
+ if (account_name)
+ result = modest_account_mgr_set_default_account (self, account_name);
+ }
+
+ modest_account_mgr_free_account_names (account_names);
+ account_names = NULL;
+
+ return result;
+}
+
gchar*
modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name)
{
return from;
}
+
+/* Add a number to the end of the text, or increment a number that is already there.
+ */
+static gchar*
+util_increment_name (const gchar* text)
+{
+ /* Get the end character,
+ * also doing a UTF-8 validation which is required for using g_utf8_prev_char().
+ */
+ const gchar* end = NULL;
+ if (!g_utf8_validate (text, -1, &end))
+ return NULL;
+
+ if (!end)
+ return NULL;
+
+ --end; /* Go to before the null-termination. */
+
+ /* Look at each UTF-8 characer, starting at the end: */
+ const gchar* p = end;
+ const gchar* alpha_end = NULL;
+ while (p)
+ {
+ /* Stop when we reach the first character that is not a numeric digit: */
+ const gunichar ch = g_utf8_get_char (p);
+ if (!g_unichar_isdigit (ch)) {
+ alpha_end = p;
+ break;
+ }
+
+ p = g_utf8_prev_char (p);
+ }
+
+ if(!alpha_end) {
+ /* The text must consist completely of numeric digits. */
+ alpha_end = text;
+ }
+ else
+ ++alpha_end;
+
+ /* Intepret and increment the number, if any: */
+ gint num = atol (alpha_end);
+ ++num;
+
+ /* Get the name part: */
+ gint name_len = alpha_end - text;
+ gchar *name_without_number = g_malloc(name_len + 1);
+ memcpy (name_without_number, text, name_len);
+ name_without_number[name_len] = 0;\
+
+ /* Concatenate the text part and the new number: */
+ gchar *result = g_strdup_printf("%s%d", name_without_number, num);
+ g_free (name_without_number);
+
+ return result;
+}
+
+gchar*
+modest_account_mgr_get_unused_account_name (ModestAccountMgr *self, const gchar* starting_name,
+ gboolean server_account)
+{
+ gchar *account_name = g_strdup (starting_name);
+
+ while (modest_account_mgr_account_exists (self,
+ account_name, server_account /* server_account */)) {
+
+ gchar * account_name2 = util_increment_name (account_name);
+ g_free (account_name);
+ account_name = account_name2;
+ }
+
+ return account_name;
+}
+
+gchar*
+modest_account_mgr_get_unused_account_display_name (ModestAccountMgr *self, const gchar* starting_name)
+{
+ gchar *account_name = g_strdup (starting_name);
+
+ while (modest_account_mgr_account_with_display_name_exists (self, account_name)) {
+
+ gchar * account_name2 = util_increment_name (account_name);
+ g_free (account_name);
+ account_name = account_name2;
+ }
+
+ return account_name;
+}