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)
return modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SIGNATURE, FALSE);
}
-
-
-#if 0 /* Not needed, but works. */
-static gint
-compare_option_strings_for_name (const gchar* a, const gchar* b)
-{
- /* 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;
-
- /* 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. */
-
- /* printf(" debug: name=%s\n", name); */
- gint result = strcmp (name, b);
-
- g_free (name);
-
- return result;
-}
-
-gchar*
-modest_server_account_data_get_option_string (GSList* options_list, const gchar* option_name)
+ModestTransportStoreProtocol modest_account_mgr_get_store_protocol (ModestAccountMgr *self, const gchar* name)
{
- if (!options_list)
- return NULL;
+ ModestTransportStoreProtocol result = MODEST_PROTOCOL_STORE_POP; /* Arbitrary default */
- 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;
+ gchar *server_account_name = modest_account_mgr_get_string (self, name,
+ MODEST_ACCOUNT_STORE_ACCOUNT,
+ FALSE);
+ if (server_account_name) {
+ ModestServerAccountData* server_data =
+ modest_account_mgr_get_server_account_data (self, server_account_name);
+ result = server_data->proto;
+
+ modest_account_mgr_free_server_account_data (self, server_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;
- }
- }
- }
+ g_free (server_account_name);
}
-
- return result;
-}
-
-gboolean
-modest_server_account_data_get_option_bool (GSList* options_list, const gchar* option_name)
-{
- if (!options_list)
- return FALSE;
- gboolean result = FALSE;
- GSList* option = g_slist_find_custom(options_list, option_name, (GCompareFunc)strcmp);
- if(option) {
- return TRUE;
- }
-
return result;
}
-#endif
-
gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self,
const gchar* account_name,
GSList *list = modest_account_mgr_get_list (self, account_name,
MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
- MODEST_CONF_VALUE_STRING, TRUE);
+ MODEST_CONF_VALUE_STRING, FALSE);
/* The server account is in the item after the connection name: */
GSList *list_connection = g_slist_append (list, (gpointer)connection_name);
/* Reset the changed list: */
modest_account_mgr_set_list (self, account_name,
- MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list,
- MODEST_CONF_VALUE_STRING, TRUE);
+ 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);
{
GSList *list = modest_account_mgr_get_list (self, account_name,
MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
- MODEST_CONF_VALUE_STRING, TRUE);
+ MODEST_CONF_VALUE_STRING, FALSE);
if (!list)
return FALSE;
/* Reset the changed list: */
modest_account_mgr_set_list (self, account_name,
MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list,
- MODEST_CONF_VALUE_STRING, TRUE);
+ MODEST_CONF_VALUE_STRING, FALSE);
/* TODO: Should we free the items too, or just the list? */
g_slist_free (list);
return TRUE;
}
+gboolean modest_account_mgr_get_has_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_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;
+
+ /* 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
GSList *list = modest_account_mgr_get_list (self, account_name,
MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
- MODEST_CONF_VALUE_STRING, TRUE);
+ MODEST_CONF_VALUE_STRING, FALSE);
if (!list)
return NULL;
-
+
/* 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) {
- GSList * list_server_account = g_slist_next(list_connection);
- if (list_server_account)
- result = g_strdup ((gchar*)(list_server_account->data));
+ 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 */);
+}
-static ModestProtocol
+void
+modest_server_account_set_username (ModestAccountMgr *self, const gchar* account_name,
+ const gchar* username)
+{
+ /* 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);
+
+ modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_USERNAME,
+ username, TRUE /* server account */);
+
+ /* 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);
+}
+
+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)
+{
+ 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_password (ModestAccountMgr *self, const gchar* account_name)
+{
+ return modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_PASSWORD,
+ TRUE /* server account */);
+}
+
+gboolean
+modest_server_account_get_has_password (ModestAccountMgr *self, const gchar* account_name)
+{
+ gboolean result = FALSE;
+ gchar *password = modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_PASSWORD,
+ TRUE /* server account */);
+ if (password && strlen (password)) {
+ result = TRUE;
+ }
+
+ g_free (password);
+ return result;
+}
+
+
+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)
{
- ModestProtocol result = MODEST_PROTOCOL_AUTH_NONE;
+ ModestAuthProtocol result = MODEST_PROTOCOL_AUTH_NONE;
if (value) {
if (strcmp(value, MODEST_ACCOUNT_AUTH_MECH_VALUE_NONE) == 0)
result = MODEST_PROTOCOL_AUTH_NONE;
return result;
}
-ModestProtocol
+ModestAuthProtocol
modest_server_account_get_secure_auth (ModestAccountMgr *self,
const gchar* account_name)
{
- ModestProtocol result = MODEST_PROTOCOL_AUTH_NONE;
+ 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) {
void
modest_server_account_set_secure_auth (ModestAccountMgr *self,
- const gchar* account_name, ModestProtocol secure_auth)
+ const gchar* account_name, ModestAuthProtocol secure_auth)
{
/* Get the conf string for the enum value: */
const gchar* str_value = NULL;
modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_AUTH_MECH, str_value, TRUE);
}
-static ModestProtocol
+static ModestConnectionProtocol
get_security_for_conf_string(const gchar* value)
{
- ModestProtocol result = MODEST_PROTOCOL_SECURITY_NONE;
+ ModestConnectionProtocol result = MODEST_PROTOCOL_CONNECTION_NORMAL;
if (value) {
if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_NONE) == 0)
- result = MODEST_PROTOCOL_SECURITY_NONE;
- else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_NORMAL) == 0)
- result = MODEST_PROTOCOL_SECURITY_TLS;
- else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_SSL) == 0)
- result = MODEST_PROTOCOL_SECURITY_SSL;
+ 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;
}
return result;
}
-ModestProtocol
+ModestConnectionProtocol
modest_server_account_get_security (ModestAccountMgr *self,
const gchar* account_name)
{
- ModestProtocol result = MODEST_PROTOCOL_SECURITY_NONE;
+ ModestConnectionProtocol result = MODEST_PROTOCOL_CONNECTION_NORMAL;
gchar* value = modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_SECURITY,
TRUE /* server account */);
if (value) {
void
modest_server_account_set_security (ModestAccountMgr *self,
- const gchar* account_name, ModestProtocol security)
+ 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)
+ if (security == MODEST_PROTOCOL_CONNECTION_NORMAL)
str_value = MODEST_ACCOUNT_SECURITY_VALUE_NONE;
- else if (security == MODEST_PROTOCOL_SECURITY_TLS)
+ else if (security == MODEST_PROTOCOL_CONNECTION_TLS) {
+ /* The UI has "Normal (TLS)": */
str_value = MODEST_ACCOUNT_SECURITY_VALUE_NORMAL;
- else if (security == MODEST_PROTOCOL_SECURITY_SSL)
+ } else if (security == MODEST_PROTOCOL_CONNECTION_SSL)
str_value = MODEST_ACCOUNT_SECURITY_VALUE_SSL;
/* Set it in the configuration: */
modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_SECURITY, str_value, TRUE);
}
-
-#if 0
-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;
-}
-#endif
ModestServerAccountData*
modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name)
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);
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;
}
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);
}
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);
+ return modest_conf_set_string (conf, MODEST_CONF_DEFAULT_ACCOUNT, account, NULL);
}
gboolean
}
+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)
+modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self)
{
- gboolean result = FALSE;
+ gchar *old_default;
+ gboolean result = FALSE, found;
+ GSList* list_sorted, *iter;
+ const gchar* account_name = NULL;
GSList *account_names = modest_account_mgr_account_names (self, TRUE /* only enabled */);
- if(account_names)
- {
- const gchar* account_name = (const gchar*)account_names->data;
- if (account_name)
- result = modest_account_mgr_set_default_account (self, account_name);
+
+ /* Return TRUE if there is no account */
+ if (!account_names)
+ return TRUE;
+
+ /* Get the first one, alphabetically, by title: */
+ old_default = modest_account_mgr_get_default_account (self);
+ list_sorted = g_slist_sort (account_names, on_accounts_list_sort_by_title);
+
+ iter = list_sorted;
+ found = FALSE;
+ while (iter && !found) {
+ account_name = (const gchar*)list_sorted->data;
+
+ if (old_default) {
+ /* The new should be different than the old one */
+ if (strcmp (old_default, account_name))
+ found = TRUE;
+ } else
+ found = TRUE;
+
+ if (!found)
+ iter = g_slist_next (iter);
}
-
- /* TODO: Free the strings too? */
- g_slist_free (account_names);
-
+
+ if (found && 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;
}
projects / modest / blobdiff