X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.c;h=9a969125df9234d02089a5260e8cd5a9eb7cda8c;hp=eecde23f77a3c6b7583a01e4540cac697d367d9d;hb=fc741ebc372d1c8d4756641b96cb7cc37f986e47;hpb=9f4b19654c1a2e8190d754306a17ce1fd0c14fd6 diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c index eecde23..9a96912 100644 --- a/src/modest-account-mgr-helpers.c +++ b/src/modest-account-mgr-helpers.c @@ -31,7 +31,11 @@ #include #include #include +#include #include +#include +#include +#include static const gchar * null_means_empty (const gchar * str); @@ -65,27 +69,27 @@ gboolean modest_account_mgr_set_signature (ModestAccountMgr *self, const gchar* 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) +ModestProtocolType modest_account_mgr_get_store_protocol (ModestAccountMgr *self, const gchar* name) { - ModestTransportStoreProtocol result = MODEST_PROTOCOL_STORE_POP; /* Arbitrary default */ + ModestProtocolType result = MODEST_PROTOCOLS_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); + modest_account_mgr_load_server_settings (self, server_account_name, FALSE); result = modest_server_account_settings_get_protocol (server_settings); g_object_unref (server_settings); @@ -97,10 +101,12 @@ ModestTransportStoreProtocol modest_account_mgr_get_store_protocol (ModestAccoun } -gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self, - const gchar* connection_name, const gchar* server_account_name) +gboolean +modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self, + 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; @@ -115,8 +121,8 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self result = FALSE; } else { /* The server account is in the item after the connection name: */ - list = g_slist_append (list, (gpointer)connection_name); - list = g_slist_append (list, (gpointer)server_account_name); + list = g_slist_append (list, g_strdup (connection_id)); + list = g_slist_append (list, g_strdup (server_account_name)); /* Reset the changed list: */ modest_conf_set_list (conf, MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, list, @@ -128,8 +134,11 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self } } - /* TODO: Should we free the items too, or just the list? */ - g_slist_free (list); + /* Free the list */ + if (list) { + g_slist_foreach (list, (GFunc) g_free, NULL); + g_slist_free (list); + } return result; } @@ -138,22 +147,23 @@ 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) +gboolean +modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *self, + 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); @@ -165,7 +175,7 @@ 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: */ @@ -182,8 +192,11 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s result = FALSE; } - /* TODO: Should we free the items too, or just the list? */ - g_slist_free (list); + /* Free the list */ + if (list) { + g_slist_foreach (list, (GFunc) g_free, NULL); + g_slist_free (list); + } return result; } @@ -205,13 +218,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; @@ -232,8 +245,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) { @@ -251,14 +264,11 @@ gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self, iter = g_slist_next (iter); } - /* - if (!result) { - printf (" debug: no server found for connection_name=%s.\n", connection_name); + /* Free the list */ + if (list) { + g_slist_foreach (list, (GFunc) g_free, NULL); + g_slist_free (list); } - */ - - /* TODO: Should we free the items too, or just the list? */ - g_slist_free (list); return result; } @@ -284,8 +294,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_set_server_account_username_has_succeeded (self, account_name, - TRUE); + modest_account_mgr_set_server_account_username_has_succeeded (self, account_name, FALSE); g_free (existing_username); } @@ -306,15 +315,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) { @@ -330,8 +330,11 @@ modest_account_mgr_get_server_account_has_password (ModestAccountMgr *self, cons TRUE /* server account */); if (password && strlen (password)) { result = TRUE; - } + /* Clean password */ + bzero (password, strlen (password)); + } + g_free (password); return result; } @@ -361,17 +364,26 @@ modest_account_mgr_set_server_account_hostname (ModestAccountMgr *self, -ModestAuthProtocol +ModestProtocolType modest_account_mgr_get_server_account_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 */); + ModestProtocolRegistry *protocol_registry; + ModestProtocolType result = MODEST_PROTOCOLS_AUTH_NONE; + gchar* value; + + protocol_registry = modest_runtime_get_protocol_registry (); + value = modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_AUTH_MECH, + TRUE /* server account */); if (value) { - result = modest_protocol_info_get_auth_protocol (value); - + ModestProtocol *protocol; + + protocol = modest_protocol_registry_get_protocol_by_name (protocol_registry, MODEST_PROTOCOL_REGISTRY_AUTH_PROTOCOLS, value); g_free (value); + + if (protocol) + result = modest_protocol_get_type_id (protocol); + } return result; @@ -380,28 +392,42 @@ modest_account_mgr_get_server_account_secure_auth (ModestAccountMgr *self, void modest_account_mgr_set_server_account_secure_auth (ModestAccountMgr *self, - const gchar* account_name, ModestAuthProtocol secure_auth) + const gchar* account_name, ModestProtocolType secure_auth) { - /* Get the conf string for the enum value: */ - const gchar* str_value = NULL; - - str_value = modest_protocol_info_get_auth_protocol_name (secure_auth); + const gchar* str_value; + ModestProtocolRegistry *protocol_registry; + ModestProtocol *protocol; + + /* Get the conf string for the protocol: */ + protocol_registry = modest_runtime_get_protocol_registry (); + protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, secure_auth); + str_value = modest_protocol_get_name (protocol); /* Set it in the configuration: */ modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_AUTH_MECH, str_value, TRUE); } -ModestConnectionProtocol +ModestProtocolType modest_account_mgr_get_server_account_security (ModestAccountMgr *self, const gchar* account_name) { - ModestConnectionProtocol result = MODEST_PROTOCOL_CONNECTION_NORMAL; - gchar* value = modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_SECURITY, - TRUE /* server account */); + ModestProtocolType result = MODEST_PROTOCOLS_CONNECTION_NONE; + gchar* value; + + value = modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_SECURITY, + TRUE /* server account */); if (value) { - result = modest_protocol_info_get_connection_protocol (value); - + ModestProtocolRegistry *protocol_registry; + ModestProtocol *protocol; + + protocol_registry = modest_runtime_get_protocol_registry (); + protocol = modest_protocol_registry_get_protocol_by_name (protocol_registry, + MODEST_PROTOCOL_REGISTRY_CONNECTION_PROTOCOLS, + value); g_free (value); + + if (protocol) + result = modest_protocol_get_type_id (protocol); } return result; @@ -409,61 +435,124 @@ modest_account_mgr_get_server_account_security (ModestAccountMgr *self, void modest_account_mgr_set_server_account_security (ModestAccountMgr *self, - const gchar* account_name, ModestConnectionProtocol security) + const gchar* account_name, + ModestProtocolType security) { - /* Get the conf string for the enum value: */ - const gchar* str_value = NULL; - str_value = modest_protocol_info_get_connection_protocol_name (security); + const gchar* str_value; + ModestProtocolRegistry *protocol_registry; + ModestProtocol *protocol; + + /* Get the conf string for the protocol type: */ + protocol_registry = modest_runtime_get_protocol_registry (); + protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, security); + str_value = modest_protocol_get_name (protocol); /* Set it in the configuration: */ modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_SECURITY, str_value, TRUE); } -ModestServerAccountSettings* -modest_account_mgr_load_server_settings (ModestAccountMgr *self, const gchar* name) +ModestServerAccountSettings * +modest_account_mgr_load_server_settings (ModestAccountMgr *self, const gchar* name, gboolean is_transport_and_not_store) { - ModestServerAccountSettings *settings; - gchar *string; - - g_return_val_if_fail (modest_account_mgr_account_exists (self, name, TRUE), NULL); + ModestServerAccountSettings *settings = NULL; + ModestProtocol *protocol; + ModestProtocolRegistry *registry; + gchar *hostname, *username, *pwd, *uri, *proto, *auth, *sec; + + if (!modest_account_mgr_account_exists (self, name, TRUE)) { + g_warning ("%s account %s does not exist", __FUNCTION__, name); + return NULL; + } + + registry = modest_runtime_get_protocol_registry (); settings = modest_server_account_settings_new (); modest_server_account_settings_set_account_name (settings, name); - string = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_HOSTNAME,TRUE); - modest_server_account_settings_set_hostname (settings, string); - g_free (string); - - string = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_USERNAME,TRUE); - modest_server_account_settings_set_username (settings, string); - g_free (string); + proto = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, TRUE); + if (proto) { + gchar *tag = NULL; + if (is_transport_and_not_store) { + tag = MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS; + } else { + tag = MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS; + } + protocol = modest_protocol_registry_get_protocol_by_name (registry, tag, proto); - 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_protocol (settings, + modest_protocol_get_type_id (protocol)); + g_free (proto); + } else { + goto on_error; + } 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); + auth = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_AUTH_MECH, TRUE); + if (auth) { + protocol = modest_protocol_registry_get_protocol_by_name (registry, MODEST_PROTOCOL_REGISTRY_AUTH_PROTOCOLS, auth); + modest_server_account_settings_set_auth_protocol (settings, + modest_protocol_get_type_id (protocol)); + g_free (auth); + } else { + modest_server_account_settings_set_auth_protocol (settings, MODEST_PROTOCOLS_AUTH_NONE); + } + + sec = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SECURITY, TRUE); + if (sec) { + protocol = modest_protocol_registry_get_protocol_by_name (registry, MODEST_PROTOCOL_REGISTRY_CONNECTION_PROTOCOLS, sec); + modest_server_account_settings_set_security_protocol (settings, + modest_protocol_get_type_id (protocol)); + g_free (sec); + } else { + modest_server_account_settings_set_security_protocol (settings, + MODEST_PROTOCOLS_CONNECTION_NONE); + } + + /* Username, password and URI. Note that the URI could include + the former two, so in this case there is no need to have + them */ + username = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_USERNAME,TRUE); + if (username) + modest_server_account_settings_set_username (settings, username); + + pwd = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_PASSWORD, TRUE); + if (pwd) { + modest_server_account_settings_set_password (settings, pwd); + g_free (pwd); + } + + uri = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_URI, TRUE); + if (uri) + modest_server_account_settings_set_uri (settings, uri); + + hostname = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_HOSTNAME,TRUE); + if (hostname) + modest_server_account_settings_set_hostname (settings, hostname); + + if (!uri) { + if (!username || !hostname) { + g_free (username); + g_free (hostname); + goto on_error; + } + } + + g_free (username); + g_free (hostname); + g_free (uri); - string = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_PASSWORD, TRUE); - modest_server_account_settings_set_password (settings, string); - g_free (string); - return settings; + + on_error: + if (settings) + g_object_unref (settings); + return NULL; } gboolean @@ -472,27 +561,40 @@ modest_account_mgr_save_server_settings (ModestAccountMgr *self, { gboolean has_errors = FALSE; const gchar *account_name; - const gchar *protocol; + const gchar *protocol_name; const gchar *uri; + ModestProtocolRegistry *protocol_registry; + ModestProtocol *protocol; g_return_val_if_fail (MODEST_IS_SERVER_ACCOUNT_SETTINGS (settings), FALSE); + protocol_registry = modest_runtime_get_protocol_registry (); 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)); + protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, + modest_server_account_settings_get_protocol (settings)); + protocol_name = modest_protocol_get_name (protocol); 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)); + const gchar *hostname; + const gchar *username; + const gchar *password; + gint port; + const gchar *auth_protocol_name; + const gchar *security_name; + + hostname = null_means_empty (modest_server_account_settings_get_hostname (settings)); + username = null_means_empty (modest_server_account_settings_get_username (settings)); + password = null_means_empty (modest_server_account_settings_get_password (settings)); + port = modest_server_account_settings_get_port (settings); + protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, + modest_server_account_settings_get_auth_protocol (settings)); + auth_protocol_name = modest_protocol_get_name (protocol); + protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, + modest_server_account_settings_get_security_protocol (settings)); + security_name = modest_protocol_get_name (protocol); has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_HOSTNAME, hostname, TRUE); @@ -504,17 +606,17 @@ modest_account_mgr_save_server_settings (ModestAccountMgr *self, password, TRUE)); if (!has_errors) (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PROTO, - protocol, TRUE)); + protocol_name, 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)); + auth_protocol_name, TRUE)); if (!has_errors) (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_SECURITY, - security, + security_name, TRUE)); } else { const gchar *uri = modest_server_account_settings_get_uri (settings); @@ -522,7 +624,7 @@ modest_account_mgr_save_server_settings (ModestAccountMgr *self, uri, TRUE); if (!has_errors) (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PROTO, - protocol, TRUE)); + protocol_name, TRUE)); } return !has_errors; @@ -596,11 +698,20 @@ modest_account_mgr_load_account_settings (ModestAccountMgr *self, FALSE); if (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); + store_settings = modest_account_mgr_load_server_settings (self, server_account, FALSE); g_free (server_account); + + /* It could happen that the account data is corrupted + so it's not loaded properly */ + if (store_settings) { + modest_account_settings_set_store_settings (settings, + store_settings); + g_object_unref (store_settings); + } else { + g_warning ("%s can not load server settings. Account corrupted?", __FUNCTION__); + g_object_unref (settings); + return NULL; + } } /* transport */ @@ -609,10 +720,17 @@ modest_account_mgr_load_account_settings (ModestAccountMgr *self, FALSE); if (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); + transport_settings = modest_account_mgr_load_server_settings (self, server_account, TRUE); g_free (server_account); + + if (transport_settings) { + modest_account_settings_set_transport_settings (settings, transport_settings); + g_object_unref (transport_settings); + } else { + g_warning ("%s can not load server settings. Account corrupted?", __FUNCTION__); + g_object_unref (settings); + return NULL; + } } return settings; @@ -622,15 +740,13 @@ void 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; + g_return_if_fail (MODEST_IS_ACCOUNT_MGR (mgr)); + g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS (settings)); + account_name = modest_account_settings_get_account_name (settings); g_return_if_fail (account_name != NULL); @@ -654,20 +770,26 @@ modest_account_mgr_save_account_settings (ModestAccountMgr *mgr, 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) { + if (store_settings) { + const gchar *store_account_name; + store_account_name = modest_server_account_settings_get_account_name (store_settings); + if (store_account_name) + modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_STORE_ACCOUNT, + store_account_name, FALSE); modest_account_mgr_save_server_settings (mgr, store_settings); + g_object_unref (store_settings); } - modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_STORE_ACCOUNT, store_account_name, FALSE); - g_object_unref (store_settings); 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) { + if (transport_settings) { + const gchar *transport_account_name; + transport_account_name = modest_server_account_settings_get_account_name (transport_settings); + if (transport_account_name) + modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, + transport_account_name, FALSE); modest_account_mgr_save_server_settings (mgr, transport_settings); + g_object_unref (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); } @@ -732,22 +854,49 @@ modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self) } gchar* -modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name) +modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name, const gchar *mailbox) { - gchar *fullname, *email, *from; + gchar *from; + gchar *transport_account; + gchar *proto; g_return_val_if_fail (self, NULL); g_return_val_if_fail (name, NULL); - fullname = modest_account_mgr_get_string (self, name,MODEST_ACCOUNT_FULLNAME, - FALSE); - email = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_EMAIL, - FALSE); - from = g_strdup_printf ("%s <%s>", - fullname ? fullname : "", - email ? email : ""); - g_free (fullname); - g_free (email); + from = NULL; + + transport_account = modest_account_mgr_get_server_account_name (self, + name, + TNY_ACCOUNT_TYPE_TRANSPORT); + if (transport_account) { + proto = modest_account_mgr_get_string (self, transport_account, MODEST_ACCOUNT_PROTO, TRUE); + if (proto != NULL) { + ModestProtocol *protocol = + modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (), + MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS, + proto); + if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) { + from = modest_account_protocol_get_from (MODEST_ACCOUNT_PROTOCOL (protocol), + name, + mailbox); + } + g_free (proto); + } + } + + if (from == NULL) { + gchar *fullname, *email; + + fullname = modest_account_mgr_get_string (self, name,MODEST_ACCOUNT_FULLNAME, + FALSE); + email = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_EMAIL, + FALSE); + from = g_strdup_printf ("%s <%s>", + fullname ? fullname : "", + email ? email : ""); + g_free (fullname); + g_free (email); + } return from; } @@ -757,6 +906,8 @@ modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name) static gchar* util_increment_name (const gchar* text) { + g_return_val_if_fail (text, NULL); + /* Get the end character, * also doing a UTF-8 validation which is required for using g_utf8_prev_char(). */ @@ -781,7 +932,7 @@ util_increment_name (const gchar* text) break; } - p = g_utf8_prev_char (p); + p = g_utf8_find_prev_char (text, p); } if(!alpha_end) { @@ -1028,3 +1179,105 @@ modest_account_mgr_set_user_email (ModestAccountMgr *self, email, FALSE /* not server account */); } + +gboolean +modest_account_mgr_account_is_multimailbox (ModestAccountMgr *mgr, + const gchar *account_name, + ModestProtocol **mmb_protocol) +{ + gchar *transport_account; + gboolean result = FALSE; + + if (mmb_protocol) + *mmb_protocol = NULL; + + transport_account = modest_account_mgr_get_server_account_name (mgr, + account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); + if (transport_account) { + gchar *proto; + ModestProtocolRegistry *registry; + + registry = modest_runtime_get_protocol_registry (); + + proto = modest_account_mgr_get_string (mgr, transport_account, + MODEST_ACCOUNT_PROTO, TRUE); + if (proto != NULL) { + ModestProtocol *protocol = + modest_protocol_registry_get_protocol_by_name (registry, + MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS, + proto); + if (protocol && + modest_protocol_registry_protocol_type_has_tag + (registry, + modest_protocol_get_type_id (protocol), + MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS)) { + if (mmb_protocol) + *mmb_protocol = protocol; + result = TRUE; + } + + } + } + + return result; +} + +gchar * +modest_account_mgr_get_signature_from_recipient (ModestAccountMgr *mgr, + const gchar *current_recipient, + gboolean *has_signature) +{ + gchar *result = NULL; + gchar *mailbox = NULL; + gchar *account_name; + ModestProtocol *protocol = NULL; + + *has_signature = FALSE; + + account_name = modest_utils_get_account_name_from_recipient (current_recipient, &mailbox); + if (modest_account_mgr_account_is_multimailbox (mgr, account_name, &protocol)) { + if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) { + result = modest_account_protocol_get_signature (MODEST_ACCOUNT_PROTOCOL (protocol), + account_name, mailbox, + has_signature); + } + } + + if (result == NULL) { + result = modest_account_mgr_get_signature (mgr, + account_name, has_signature); + } + return result; +} + +void +modest_account_mgr_get_branding_from_recipient (ModestAccountMgr *mgr, + const gchar *current_recipient, + gchar **service_name, + const GdkPixbuf **service_icon, + guint64 icon_size) +{ + gchar *mailbox = NULL; + gchar *account_name; + ModestProtocol *protocol = NULL; + + *service_name = NULL; + *service_icon = NULL; + + account_name = modest_utils_get_account_name_from_recipient (current_recipient, &mailbox); + if (modest_account_mgr_account_is_multimailbox (mgr, account_name, &protocol)) { + if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) { + gchar *name; + const GdkPixbuf *icon; + name = modest_account_protocol_get_service_name (MODEST_ACCOUNT_PROTOCOL (protocol), + account_name, mailbox); + icon = modest_account_protocol_get_service_icon (MODEST_ACCOUNT_PROTOCOL (protocol), + account_name, mailbox, icon_size); + *service_name = name; + *service_icon = icon; + } + } + +} +