X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.c;h=1542e83b53d0e819dcca716f8ced84200c648da3;hp=48c39a13c355da58e4c95a2755a3fe15ca4e06cd;hb=b82646213f0d683e64a8a3b115d69fb0d243cd2e;hpb=a2f971fd9378912d99ca8ce97c514bba81a3c4e2 diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c index 48c39a1..1542e83 100644 --- a/src/modest-account-mgr-helpers.c +++ b/src/modest-account-mgr-helpers.c @@ -33,6 +33,14 @@ #include #include +static const gchar * null_means_empty (const gchar * str); + +static const gchar * +null_means_empty (const gchar * str) +{ + return str ? str : ""; +} + gboolean modest_account_mgr_set_enabled (ModestAccountMgr *self, const gchar* name, gboolean enabled) @@ -53,46 +61,46 @@ gboolean modest_account_mgr_set_signature (ModestAccountMgr *self, const gchar* 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); + null_means_empty (signature), FALSE); return result; } -gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* name, - gboolean* use_signature) +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); - } + *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); } - 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; + 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) { + ModestServerAccountSettings* server_settings = + modest_account_mgr_load_server_settings (self, server_account_name); + result = modest_server_account_settings_get_protocol (server_settings); + + g_object_unref (server_settings); + + g_free (server_account_name); + } + + return result; } + gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self, - const gchar* connection_name, const gchar* server_account_name) + const gchar* connection_id, const gchar* server_account_name) { - modest_account_mgr_remove_connection_specific_smtp (self, connection_name); + modest_account_mgr_remove_connection_specific_smtp (self, connection_id); ModestConf *conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf; @@ -107,11 +115,11 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self result = FALSE; } else { /* 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); + list = g_slist_append (list, (gpointer)connection_id); + list = g_slist_append (list, (gpointer)server_account_name); /* Reset the changed list: */ - modest_conf_set_list (conf, MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, list_connection, + modest_conf_set_list (conf, MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, list, MODEST_CONF_VALUE_STRING, &err); if (err) { g_printerr ("modest: %s: error setting list: %s.\n", __FUNCTION__, err->message); @@ -130,22 +138,22 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self * modest_account_mgr_remove_connection_specific_smtp * @self: a ModestAccountMgr instance * @name: the account name - * @connection_name: A libconic IAP connection name + * @connection_id: A libconic IAP connection id * * 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* connection_name) + const gchar* connection_id) { ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); gboolean result = TRUE; GError *err = NULL; GSList *list = modest_conf_get_list (priv->modest_conf, - MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, - MODEST_CONF_VALUE_STRING, &err); + MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, + MODEST_CONF_VALUE_STRING, &err); if (err) { g_printerr ("modest: %s: error getting list: %s.\n", __FUNCTION__, err->message); g_error_free (err); @@ -157,11 +165,12 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s 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); + GSList *list_connection = g_slist_find_custom (list, connection_id, (GCompareFunc)strcmp); if (list_connection) { + GSList *account_node = g_slist_next (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)); + list = g_slist_delete_link(list, list_connection); + list = g_slist_delete_link(list, account_node); } /* Reset the changed list: */ @@ -196,13 +205,13 @@ gboolean modest_account_mgr_set_use_connection_specific_smtp (ModestAccountMgr * /** * modest_account_mgr_get_connection_specific_smtp * @self: a ModestAccountMgr instance - * @connection_name: A libconic IAP connection name + * @connection_id: A libconic IAP connection id * * 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* connection_name) +gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self, const gchar* connection_id) { gchar *result = NULL; @@ -223,8 +232,8 @@ gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self, /* 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) { + const gchar* this_connection_id = (const gchar*)(iter->data); + if (strcmp (this_connection_id, connection_id) == 0) { iter = g_slist_next (iter); if (iter) { @@ -244,7 +253,7 @@ gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self, /* if (!result) { - printf (" debug: no server found for connection_name=%s.\n", connection_name); + printf (" debug: no server found for connection_id=%s.\n", connection_id); } */ @@ -275,7 +284,7 @@ modest_account_mgr_set_server_account_username (ModestAccountMgr *self, const gc /* We don't know anything about new usernames: */ if (strcmp (existing_username, username) != 0) - modest_account_mgr_get_server_account_username_has_succeeded (self, account_name); + modest_account_mgr_set_server_account_username_has_succeeded (self, account_name, FALSE); g_free (existing_username); } @@ -296,15 +305,6 @@ modest_account_mgr_set_server_account_username_has_succeeded (ModestAccountMgr * succeeded, TRUE /* server account */); } -void -modest_account_mgr_set_server_account_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_account_mgr_get_server_account_password (ModestAccountMgr *self, const gchar* account_name) { @@ -350,21 +350,6 @@ modest_account_mgr_set_server_account_hostname (ModestAccountMgr *self, } -static ModestAuthProtocol -get_secure_auth_for_conf_string(const gchar* value) -{ - ModestAuthProtocol result = MODEST_PROTOCOL_AUTH_NONE; - if (value) { - if (strcmp(value, MODEST_ACCOUNT_AUTH_MECH_VALUE_NONE) == 0) - result = MODEST_PROTOCOL_AUTH_NONE; - else if (strcmp(value, MODEST_ACCOUNT_AUTH_MECH_VALUE_PASSWORD) == 0) - result = MODEST_PROTOCOL_AUTH_PASSWORD; - else if (strcmp(value, MODEST_ACCOUNT_AUTH_MECH_VALUE_CRAMMD5) == 0) - result = MODEST_PROTOCOL_AUTH_CRAMMD5; - } - - return result; -} ModestAuthProtocol modest_account_mgr_get_server_account_secure_auth (ModestAccountMgr *self, @@ -374,7 +359,7 @@ modest_account_mgr_get_server_account_secure_auth (ModestAccountMgr *self, 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); + result = modest_protocol_info_get_auth_protocol (value); g_free (value); } @@ -389,34 +374,13 @@ modest_account_mgr_set_server_account_secure_auth (ModestAccountMgr *self, { /* Get the conf string for the enum value: */ const gchar* str_value = NULL; - if (secure_auth == MODEST_PROTOCOL_AUTH_NONE) - str_value = MODEST_ACCOUNT_AUTH_MECH_VALUE_NONE; - else if (secure_auth == MODEST_PROTOCOL_AUTH_PASSWORD) - str_value = MODEST_ACCOUNT_AUTH_MECH_VALUE_PASSWORD; - else if (secure_auth == MODEST_PROTOCOL_AUTH_CRAMMD5) - str_value = MODEST_ACCOUNT_AUTH_MECH_VALUE_CRAMMD5; + + str_value = modest_protocol_info_get_auth_protocol_name (secure_auth); /* Set it in the configuration: */ 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; - } - - return result; -} - ModestConnectionProtocol modest_account_mgr_get_server_account_security (ModestAccountMgr *self, const gchar* account_name) @@ -425,7 +389,7 @@ modest_account_mgr_get_server_account_security (ModestAccountMgr *self, gchar* value = modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_SECURITY, TRUE /* server account */); if (value) { - result = get_security_for_conf_string (value); + result = modest_protocol_info_get_connection_protocol (value); g_free (value); } @@ -439,84 +403,132 @@ modest_account_mgr_set_server_account_security (ModestAccountMgr *self, { /* Get the conf string for the enum value: */ 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) { - /* 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; + str_value = modest_protocol_info_get_connection_protocol_name (security); /* Set it in the configuration: */ modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_SECURITY, str_value, TRUE); } -ModestServerAccountData* -modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name) +ModestServerAccountSettings* +modest_account_mgr_load_server_settings (ModestAccountMgr *self, const gchar* name) { - ModestServerAccountData *data; - gchar *proto; - - g_return_val_if_fail (modest_account_mgr_account_exists (self, name, TRUE), NULL); - data = g_slice_new0 (ModestServerAccountData); - - data->account_name = g_strdup (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_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); + ModestServerAccountSettings *settings; + gchar *string; - data->password = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PASSWORD, TRUE); - - return data; -} + g_return_val_if_fail (modest_account_mgr_account_exists (self, name, TRUE), NULL); + settings = modest_server_account_settings_new (); + modest_server_account_settings_set_account_name (settings, name); -void -modest_account_mgr_free_server_account_data (ModestAccountMgr *self, - ModestServerAccountData* data) -{ - g_return_if_fail (self); + string = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_HOSTNAME,TRUE); + modest_server_account_settings_set_hostname (settings, string); + g_free (string); - if (!data) - return; /* not an error */ + string = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_USERNAME,TRUE); + modest_server_account_settings_set_username (settings, string); + g_free (string); - g_free (data->account_name); - data->account_name = NULL; - - g_free (data->hostname); - data->hostname = NULL; + string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, TRUE); + modest_server_account_settings_set_protocol (settings, + modest_protocol_info_get_transport_store_protocol (string)); + g_free (string); + + modest_server_account_settings_set_port (settings, + modest_account_mgr_get_int (self, name, MODEST_ACCOUNT_PORT, TRUE)); + + string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_AUTH_MECH, TRUE); + modest_server_account_settings_set_auth_protocol (settings, + modest_protocol_info_get_auth_protocol(string)); + g_free (string); + + string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SECURITY, TRUE); + modest_server_account_settings_set_security (settings, + modest_protocol_info_get_connection_protocol(string)); + g_free (string); + + string = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_PASSWORD, TRUE); + modest_server_account_settings_set_password (settings, string); + g_free (string); - g_free (data->username); - data->username = NULL; + return settings; +} - g_free (data->password); - data->password = NULL; +gboolean +modest_account_mgr_save_server_settings (ModestAccountMgr *self, + ModestServerAccountSettings *settings) +{ + gboolean has_errors = FALSE; + const gchar *account_name; + const gchar *protocol; + const gchar *uri; + + g_return_val_if_fail (MODEST_IS_SERVER_ACCOUNT_SETTINGS (settings), FALSE); + account_name = modest_server_account_settings_get_account_name (settings); + + /* if we don't have a valid account name we cannot save */ + g_return_val_if_fail (account_name, FALSE); + + protocol = modest_protocol_info_get_transport_store_protocol_name ( + modest_server_account_settings_get_protocol (settings)); + uri = modest_server_account_settings_get_uri (settings); + if (!uri) { + const gchar *hostname = null_means_empty (modest_server_account_settings_get_hostname (settings)); + const gchar *username = null_means_empty (modest_server_account_settings_get_username (settings)); + const gchar *password = null_means_empty (modest_server_account_settings_get_password (settings)); + gint port = modest_server_account_settings_get_port (settings); + const gchar *auth_protocol = modest_protocol_info_get_auth_protocol_name ( + modest_server_account_settings_get_auth_protocol (settings)); + const gchar *security = modest_protocol_info_get_connection_protocol_name ( + modest_server_account_settings_get_security (settings)); + + has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_HOSTNAME, + hostname, TRUE); + if (!has_errors) + (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_USERNAME, + username, TRUE)); + if (!has_errors) + (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PASSWORD, + password, TRUE)); + if (!has_errors) + (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PROTO, + protocol, TRUE)); + if (!has_errors) + (has_errors = !modest_account_mgr_set_int (self, account_name, MODEST_ACCOUNT_PORT, + port, TRUE)); + if (!has_errors) + (has_errors = !modest_account_mgr_set_string (self, account_name, + MODEST_ACCOUNT_AUTH_MECH, + auth_protocol, TRUE)); + if (!has_errors) + (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_SECURITY, + security, + TRUE)); + } else { + const gchar *uri = modest_server_account_settings_get_uri (settings); + has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_URI, + uri, TRUE); + if (!has_errors) + (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PROTO, + protocol, TRUE)); + } + + return !has_errors; - g_slice_free (ModestServerAccountData, data); } -/** You must use modest_account_mgr_free_account_data() on the result. - */ -ModestAccountData* -modest_account_mgr_get_account_data (ModestAccountMgr *self, const gchar* name) + +ModestAccountSettings * +modest_account_mgr_load_account_settings (ModestAccountMgr *self, + const gchar* name) { - ModestAccountData *data; + ModestAccountSettings *settings; + gchar *string; gchar *server_account; gchar *default_account; + gboolean use_signature = FALSE; g_return_val_if_fail (self, NULL); g_return_val_if_fail (name, NULL); @@ -527,32 +539,57 @@ modest_account_mgr_get_account_data (ModestAccountMgr *self, const gchar* na return NULL; } - data = g_slice_new0 (ModestAccountData); - - data->account_name = g_strdup (name); + settings = modest_account_settings_new (); - data->display_name = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_DISPLAY_NAME, - FALSE); - data->fullname = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_FULLNAME, - FALSE); - data->email = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_EMAIL, - FALSE); - data->is_enabled = modest_account_mgr_get_enabled (self, name); + modest_account_settings_set_account_name (settings, name); + + string = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_DISPLAY_NAME, + FALSE); + modest_account_settings_set_display_name (settings, string); + g_free (string); + + string = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_FULLNAME, + FALSE); + modest_account_settings_set_fullname (settings, string); + g_free (string); + + string = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_EMAIL, + FALSE); + modest_account_settings_set_email_address (settings, string); + g_free (string); + + modest_account_settings_set_enabled (settings, modest_account_mgr_get_enabled (self, name)); + modest_account_settings_set_retrieve_type (settings, modest_account_mgr_get_retrieve_type (self, name)); + modest_account_settings_set_retrieve_limit (settings, modest_account_mgr_get_retrieve_limit (self, name)); default_account = modest_account_mgr_get_default_account (self); - data->is_default = (default_account && strcmp (default_account, name) == 0); + modest_account_settings_set_is_default (settings, + (default_account && strcmp (default_account, name) == 0)); g_free (default_account); + string = modest_account_mgr_get_signature (self, name, &use_signature); + modest_account_settings_set_use_signature (settings, use_signature); + modest_account_settings_set_signature (settings, string); + g_free (string); + + modest_account_settings_set_leave_messages_on_server + (settings, modest_account_mgr_get_leave_on_server (self, name)); + modest_account_settings_set_use_connection_specific_smtp + (settings, modest_account_mgr_get_use_connection_specific_smtp (self, name)); + /* store */ server_account = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_STORE_ACCOUNT, FALSE); if (server_account) { - data->store_account = - modest_account_mgr_get_server_account_data (self, server_account); + ModestServerAccountSettings *store_settings; + store_settings = modest_account_mgr_load_server_settings (self, server_account); + modest_account_settings_set_store_settings (settings, + store_settings); + g_object_unref (store_settings); g_free (server_account); } @@ -561,34 +598,70 @@ modest_account_mgr_get_account_data (ModestAccountMgr *self, const gchar* na MODEST_ACCOUNT_TRANSPORT_ACCOUNT, FALSE); if (server_account) { - data->transport_account = - modest_account_mgr_get_server_account_data (self, server_account); + ModestServerAccountSettings *transport_settings; + transport_settings = modest_account_mgr_load_server_settings (self, server_account); + modest_account_settings_set_transport_settings (settings, transport_settings); + g_object_unref (transport_settings); g_free (server_account); } - return data; + return settings; } - void -modest_account_mgr_free_account_data (ModestAccountMgr *self, ModestAccountData *data) -{ - g_return_if_fail (self); - - if (!data) /* not an error */ - return; - - g_free (data->account_name); - g_free (data->display_name); - g_free (data->fullname); - g_free (data->email); +modest_account_mgr_save_account_settings (ModestAccountMgr *mgr, + ModestAccountSettings *settings) +{ + g_return_if_fail (MODEST_IS_ACCOUNT_MGR (mgr)); + g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS (settings)); + + const gchar *account_name; + const gchar *store_account_name; + const gchar *transport_account_name; + ModestServerAccountSettings *store_settings; + ModestServerAccountSettings *transport_settings; + + account_name = modest_account_settings_get_account_name (settings); + g_return_if_fail (account_name != NULL); + + modest_account_mgr_set_display_name (mgr, account_name, + modest_account_settings_get_display_name (settings)); + modest_account_mgr_set_user_fullname (mgr, account_name, + modest_account_settings_get_fullname (settings)); + modest_account_mgr_set_user_email (mgr, account_name, + modest_account_settings_get_email_address (settings)); + modest_account_mgr_set_retrieve_type (mgr, account_name, + modest_account_settings_get_retrieve_type (settings)); + modest_account_mgr_set_retrieve_limit (mgr, account_name, + modest_account_settings_get_retrieve_limit (settings)); + modest_account_mgr_set_leave_on_server (mgr, account_name, + modest_account_settings_get_leave_messages_on_server (settings)); + modest_account_mgr_set_signature (mgr, account_name, + modest_account_settings_get_signature (settings), + modest_account_settings_get_use_signature (settings)); + modest_account_mgr_set_use_connection_specific_smtp + (mgr, account_name, + modest_account_settings_get_use_connection_specific_smtp (settings)); + + store_settings = modest_account_settings_get_store_settings (settings); + store_account_name = modest_server_account_settings_get_account_name (store_settings); + if (store_settings != NULL) { + modest_account_mgr_save_server_settings (mgr, store_settings); + } + modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_STORE_ACCOUNT, store_account_name, FALSE); + g_object_unref (store_settings); - modest_account_mgr_free_server_account_data (self, data->store_account); - modest_account_mgr_free_server_account_data (self, data->transport_account); - - g_slice_free (ModestAccountData, data); + transport_settings = modest_account_settings_get_transport_settings (settings); + transport_account_name = modest_server_account_settings_get_account_name (transport_settings); + if (transport_settings != NULL) { + modest_account_mgr_save_server_settings (mgr, transport_settings); + } + modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, transport_account_name, FALSE); + g_object_unref (transport_settings); + modest_account_mgr_set_enabled (mgr, account_name, TRUE); } + gint on_accounts_list_sort_by_title(gconstpointer a, gconstpointer b) { @@ -859,33 +932,73 @@ modest_account_mgr_get_server_account_name (ModestAccountMgr *self, FALSE); } -gchar* +static const gchar * +get_retrieve_type_name (ModestAccountRetrieveType retrieve_type) +{ + switch(retrieve_type) { + case MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY: + return MODEST_ACCOUNT_RETRIEVE_VALUE_HEADERS_ONLY; + break; + case MODEST_ACCOUNT_RETRIEVE_MESSAGES: + return MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES; + break; + case MODEST_ACCOUNT_RETRIEVE_MESSAGES_AND_ATTACHMENTS: + return MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES_AND_ATTACHMENTS; + break; + default: + return MODEST_ACCOUNT_RETRIEVE_VALUE_HEADERS_ONLY; + }; +} + +static ModestAccountRetrieveType +get_retrieve_type (const gchar *name) +{ + if (!name || name[0] == 0) + return MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY; + if (strcmp (name, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES) == 0) { + return MODEST_ACCOUNT_RETRIEVE_MESSAGES; + } else if (strcmp (name, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES_AND_ATTACHMENTS) == 0) { + return MODEST_ACCOUNT_RETRIEVE_MESSAGES_AND_ATTACHMENTS; + } else { + /* we fall back to headers only */ + return MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY; + } +} + +ModestAccountRetrieveType modest_account_mgr_get_retrieve_type (ModestAccountMgr *self, const gchar *account_name) { - return modest_account_mgr_get_string (self, - account_name, - MODEST_ACCOUNT_RETRIEVE, - FALSE /* not server account */); + gchar *string; + ModestAccountRetrieveType result; + + string = modest_account_mgr_get_string (self, + account_name, + MODEST_ACCOUNT_RETRIEVE, + FALSE /* not server account */); + result = get_retrieve_type (string); + g_free (string); + + return result; } void modest_account_mgr_set_retrieve_type (ModestAccountMgr *self, const gchar *account_name, - const gchar *retrieve_type) + ModestAccountRetrieveType retrieve_type) { modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_RETRIEVE, - retrieve_type, + get_retrieve_type_name (retrieve_type), FALSE /* not server account */); } void -modest_account_mgr_set_server_account_user_fullname (ModestAccountMgr *self, - const gchar *account_name, - const gchar *fullname) +modest_account_mgr_set_user_fullname (ModestAccountMgr *self, + const gchar *account_name, + const gchar *fullname) { modest_account_mgr_set_string (self, account_name, @@ -895,9 +1008,9 @@ modest_account_mgr_set_server_account_user_fullname (ModestAccountMgr *self, } void -modest_account_mgr_set_server_account_user_email (ModestAccountMgr *self, - const gchar *account_name, - const gchar *email) +modest_account_mgr_set_user_email (ModestAccountMgr *self, + const gchar *account_name, + const gchar *email) { modest_account_mgr_set_string (self, account_name,