return modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SIGNATURE, FALSE);
}
+
+
+ModestTransportStoreProtocol modest_account_mgr_get_store_protocol (ModestAccountMgr *self, const gchar* name)
+{
+ ModestTransportStoreProtocol result = MODEST_PROTOCOL_STORE_POP; /* Arbitrary default */
+ 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);
+
+ g_free (server_account_name);
+ }
+
+ return result;
+}
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);
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 */);
+ TRUE /* server account */);
}
void
gboolean succeeded)
{
modest_account_mgr_set_bool (self, account_name, MODEST_ACCOUNT_USERNAME_HAS_SUCCEEDED,
- succeeded, TRUE /* server account */);
+ succeeded, TRUE /* server account */);
}
void
modest_server_account_set_password (ModestAccountMgr *self, const gchar* account_name,
- const gchar* password)
+ const gchar* password)
{
modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PASSWORD,
- password, TRUE /* server account */);
+ 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)
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)
+ 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)
+ } else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_SSL) == 0)
result = MODEST_PROTOCOL_CONNECTION_SSL;
}
const gchar* str_value = NULL;
if (security == MODEST_PROTOCOL_CONNECTION_NORMAL)
str_value = MODEST_ACCOUNT_SECURITY_VALUE_NONE;
- else if (security == MODEST_PROTOCOL_CONNECTION_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_CONNECTION_SSL)
+ } else if (security == MODEST_PROTOCOL_CONNECTION_SSL)
str_value = MODEST_ACCOUNT_SECURITY_VALUE_SSL;
/* Set it in the configuration: */
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, MODEST_TRANSPORT_STORE_PROTOCOL);
+ 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);
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
return g_utf8_collate((const gchar*)a, (const gchar*)b);
}
-gboolean
-modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self)
+/** Get the first one, alphabetically, by title. */
+gchar*
+modest_account_mgr_get_first_account_name (ModestAccountMgr *self)
{
- gboolean result = FALSE;
+ const gchar* account_name = NULL;
GSList *account_names = modest_account_mgr_account_names (self, TRUE /* only enabled */);
-
+
+ /* Return TRUE if there is no account */
+ if (!account_names)
+ return NULL;
+
/* 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;
+ /* gchar *old_default = modest_account_mgr_get_default_account (self); */
+ GSList* list_sorted = g_slist_sort (account_names, on_accounts_list_sort_by_title);
+
+ GSList* iter = list_sorted;
+ gboolean found = FALSE;
+ while (iter && !found) {
+ account_name = (const gchar*)list_sorted->data;
+
if (account_name)
- result = modest_account_mgr_set_default_account (self, account_name);
+ found = TRUE;
+
+ if (!found)
+ iter = g_slist_next (iter);
}
+
+ gchar* result = NULL;
+ if (account_name)
+ result = g_strdup (account_name);
+
+ modest_account_mgr_free_account_names (account_names);
+ account_names = NULL;
+
+ return result;
+}
+
+gboolean
+modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self)
+{
+ gboolean result = FALSE;
- /* TODO: Free the strings too? */
- g_slist_free (account_names);
-
+ gchar* account_name = modest_account_mgr_get_first_account_name(self);
+ if (account_name) {
+ result = modest_account_mgr_set_default_account (self, account_name);
+ g_free (account_name);
+ }
+ else
+ result = TRUE; /* If there are no accounts then it's not a failure. */
+
return result;
}
projects / modest / blobdiff