X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.c;h=73362c49c1f9043121aff419bac9f2bc1a4a6e73;hp=5f9de4c10c3e517bdaf7d7f3b1718ba1176fe05b;hb=a53f92ed4375cec1094f41a310b9ab7b7f8a2d70;hpb=d7b7c13532fa58d8b5c7d7be3e4be540e7feaf88 diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c index 5f9de4c..73362c4 100644 --- a/src/modest-account-mgr-helpers.c +++ b/src/modest-account-mgr-helpers.c @@ -75,7 +75,27 @@ gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* na 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, @@ -85,7 +105,7 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self 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); @@ -93,8 +113,8 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self /* 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); @@ -117,7 +137,7 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s { 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; @@ -132,7 +152,7 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s /* 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); @@ -140,6 +160,19 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s return TRUE; } +gboolean modest_account_mgr_get_use_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_name) +{ + return modest_account_mgr_get_bool (self, account_name, + MODEST_ACCOUNT_USE_CONNECTION_SPECIFIC_SMTP, FALSE); +} + +gboolean modest_account_mgr_set_use_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_name, + gboolean new_value) +{ + return modest_account_mgr_set_bool (self, account_name, MODEST_ACCOUNT_USE_CONNECTION_SPECIFIC_SMTP, + new_value, FALSE); +} + /** * modest_account_mgr_get_connection_specific_smtp * @self: a ModestAccountMgr instance @@ -157,17 +190,37 @@ gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self, 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); @@ -206,7 +259,7 @@ 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 */); + TRUE /* server account */); } void @@ -214,16 +267,39 @@ modest_server_account_set_username_has_succeeded (ModestAccountMgr *self, const 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) @@ -233,10 +309,10 @@ modest_server_account_get_hostname (ModestAccountMgr *self, const gchar* account } -static ModestProtocol +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; @@ -249,11 +325,11 @@ get_secure_auth_for_conf_string(const gchar* value) 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) { @@ -268,7 +344,7 @@ modest_server_account_get_secure_auth (ModestAccountMgr *self, 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; @@ -283,27 +359,28 @@ modest_server_account_set_secure_auth (ModestAccountMgr *self, 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) { @@ -317,15 +394,16 @@ modest_server_account_get_security (ModestAccountMgr *self, 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: */ @@ -345,7 +423,7 @@ modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* 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); @@ -360,8 +438,7 @@ modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* 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->password = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PASSWORD, TRUE); return data; } @@ -492,12 +569,8 @@ modest_account_mgr_get_default_account (ModestAccountMgr *self) 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; @@ -518,10 +591,8 @@ modest_account_mgr_set_default_account (ModestAccountMgr *self, const gchar* ac 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 @@ -542,25 +613,56 @@ 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) +/** 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; }