X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-account-mgr-helpers.h;h=d5b020e88dd48e68137ff045f7d9d3c86bfa44d6;hb=26a294f695ecdce260e36a11434ddcf2c7f43b9c;hp=29c39380bed65f65b4e70c2a66d617d9b65913f2;hpb=61444b26ad8271870c8d8d460be77e0aab6e99e0;p=modest diff --git a/src/modest-account-mgr-helpers.h b/src/modest-account-mgr-helpers.h index 29c3938..d5b020e 100644 --- a/src/modest-account-mgr-helpers.h +++ b/src/modest-account-mgr-helpers.h @@ -44,14 +44,13 @@ typedef struct { gchar *account_name; gchar *hostname; gchar *username; - gchar *uri; - ModestProtocol proto; /*< The store or transport. Not ORed. */ + gchar *uri; /*< Only for mbox and maildir accounts. */ + ModestTransportStoreProtocol proto; /*< The store or transport. Not ORed. */ gchar *password; time_t last_updated; - gint port; /* Or 0, if the default should be used. */ - ModestProtocol secure_auth; - ModestProtocol security; - GSList *options; + gint port; /* Or 0, if the default should be used. */ + ModestAuthProtocol secure_auth; + ModestConnectionProtocol security; } ModestServerAccountData; typedef struct { @@ -200,6 +199,17 @@ gboolean modest_account_mgr_set_signature (ModestAccountMgr *self, const gchar* */ gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* name, gboolean* use_signature); + +/** + * modest_account_mgr_get_store_protocol: + * @self: a ModestAccountMgr instance + * @name: the account name + * + * Gets the protocol type (For instance, POP or IMAP) used for the store server account. + * + * Returns: The protocol type. + */ +ModestTransportStoreProtocol modest_account_mgr_get_store_protocol (ModestAccountMgr *self, const gchar* name); /** * modest_account_mgr_set_connection_specific_smtp @@ -229,6 +239,14 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s const gchar* connection_name); /** + * modest_account_mgr_get_has_connection_specific_smtp + * @self: a ModestAccountMgr instance + * @name: the account name + * @result: Whether this account uses any connection-specific smtp server accounts. + */ +gboolean modest_account_mgr_get_has_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_name); + +/** * modest_account_mgr_get_connection_specific_smtp * @self: a ModestAccountMgr instance * @name: the account name @@ -267,17 +285,62 @@ modest_server_account_set_username (ModestAccountMgr *self, const gchar* account const gchar* username); /** + * modest_server_account_get_username_has_succeeded: + * @self: a ModestAccountMgr instance + * @account_name: The name of a server account. + * + * Whether a connection has ever been successfully made to this account with + * the current username. This can be used to avoid asking again for the username + * when asking a second time for a non-stored password. + * + * Returns: TRUE if the username is known to be correct. + */ +gboolean +modest_server_account_get_username_has_succeeded (ModestAccountMgr *self, const gchar* account_name); + +/** + * modest_server_account_set_username_has_succeeded: + * @self: a ModestAccountMgr instance + * @account_name: The name of a server account. + * @succeeded: Whether the username has succeeded + * + * Sets whether the username is known to be correct. + */ +void +modest_server_account_set_username_has_succeeded (ModestAccountMgr *self, const gchar* account_name, + gboolean succeeded); + +/** * modest_server_account_set_password: * @self: a ModestAccountMgr instance * @account_name: The name of a server account. * @password: The new password. * - * Sets the password this server account. + * Sets the password for this server account. */ void modest_server_account_set_password (ModestAccountMgr *self, const gchar* account_name, const gchar* password); - + +/** + * modest_server_account_get_password: + * @self: a ModestAccountMgr instance + * @account_name: The name of a server account. + * + * Gets the password for this server account from the account settings. + */ +gchar* +modest_server_account_get_password (ModestAccountMgr *self, const gchar* account_name); + +/** + * modest_server_account_get_has_password: + * @self: a ModestAccountMgr instance + * @account_name: The name of a server account. + * + * Gets whether a password has been set for this server account in the account settings. + */ +gboolean +modest_server_account_get_has_password (ModestAccountMgr *self, const gchar* account_name); /** * modest_server_account_modest_server_account_get_hostnameget_username: @@ -301,7 +364,7 @@ modest_server_account_get_hostname (ModestAccountMgr *self, const gchar* account * * Returns: The secure authentication enum value. */ -ModestProtocol +ModestAuthProtocol modest_server_account_get_secure_auth (ModestAccountMgr *self, const gchar* account_name); /** @@ -314,7 +377,7 @@ modest_server_account_get_secure_auth (ModestAccountMgr *self, const gchar* acco */ void modest_server_account_set_secure_auth (ModestAccountMgr *self, const gchar* account_name, - ModestProtocol secure_auth); + ModestAuthProtocol secure_auth); /** * modest_server_account_data_get_security: @@ -325,7 +388,7 @@ modest_server_account_set_secure_auth (ModestAccountMgr *self, const gchar* acco * * Returns: The security enum value. */ -ModestProtocol +ModestConnectionProtocol modest_server_account_get_security (ModestAccountMgr *self, const gchar* account_name); /** @@ -337,7 +400,7 @@ modest_server_account_get_security (ModestAccountMgr *self, const gchar* account */ void modest_server_account_set_security (ModestAccountMgr *self, const gchar* account_name, - ModestProtocol security); + ModestConnectionProtocol security); ModestServerAccountData* modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name); @@ -345,37 +408,6 @@ modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* void modest_account_mgr_free_server_account_data (ModestAccountMgr *self, ModestServerAccountData* data); - -#if 0 -/** - * modest_account_mgr_get_account_option: - * @self: a ModestAccountMgr instance - * @account_name: the account name to check - * @account_name: the option name to check - * - * Returns: The account option value. This must be freed with g_free(). - */ -gchar* modest_account_mgr_get_server_account_option (ModestAccountMgr *self, - const gchar* account_name, const gchar* option_name); - -/** - * modest_server_account_data_get_option_value: - * @options_list: a ModestServerAccountData::options list. - * @option_name: the option name to check - * - * Returns: The account option value. This must be freed with g_free(). - */ -gchar* modest_server_account_data_get_option_string (GSList* options_list, const gchar* option_name); - -/** - * modest_server_account_data_get_option_bool: - * @options_list: a ModestServerAccountData::options list. - * @option_name: the option name to check - * - * Returns: Whether the account option is present. - */ -gboolean modest_server_account_data_get_option_bool (GSList* options_list, const gchar* option_name); -#endif /** * modest_account_mgr_get_from_string