X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.h;h=b06b9e13bc3461afa417839b455a5457a9afaac1;hp=60d91eff5d3d3acc9925c38e99bc1f40cbebaa89;hb=7dd43ed0b3b827799299291a53300db93d9b2711;hpb=652527fd671cc695045b75893d7010c246585ef2

diff --git a/src/modest-account-mgr-helpers.h b/src/modest-account-mgr-helpers.h
index 60d91ef..b06b9e1 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;
+	gchar	         *uri; /*< Only for mbox and maildir accounts. */
 	ModestProtocol    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;
+	ModestSecureAuthentication   secure_auth;
+	ModestSecureConnection   security;
 } ModestServerAccountData;
 
 typedef struct {
@@ -164,6 +163,17 @@ gboolean modest_account_mgr_set_enabled (ModestAccountMgr *self, const gchar* na
 gboolean modest_account_mgr_get_enabled (ModestAccountMgr *self, const gchar* name);
 
 /**
+ * modest_account_mgr_get_display_name:
+ * @self: a ModestAccountMgr instance
+ * @name: the account name to check
+ *
+ * Return the human-readable account title for this account, or NULL.
+ */
+gchar* modest_account_mgr_get_display_name (ModestAccountMgr *self, 
+	const gchar* name);
+
+
+/**
  * modest_account_mgr_set_signature
  * @self: a ModestAccountMgr instance
  * @name: the account name to check
@@ -229,7 +239,84 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s
  */			 
 gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self, const gchar* name,
 					 const gchar* connection_name);
-					 
+
+
+/**
+ * modest_server_account_get_username:
+ * @self: a ModestAccountMgr instance
+ * @account_name: The name of a server account.
+ *
+ * Gets the username this server account.
+ *
+ * Returns: The username.
+ */
+gchar*
+modest_server_account_get_username (ModestAccountMgr *self, const gchar* account_name);
+
+/**
+ * modest_server_account_set_username:
+ * @self: a ModestAccountMgr instance
+ * @account_name: The name of a server account.
+ * @username: The new username.
+ *
+ * Sets the username this server account.
+ */
+void
+modest_server_account_set_username (ModestAccountMgr *self, const gchar* account_name, 
+	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.
+ */
+void
+modest_server_account_set_password (ModestAccountMgr *self, const gchar* account_name, 
+	const gchar* password);
+			 
+
+/**
+ * modest_server_account_modest_server_account_get_hostnameget_username:
+ * @self: a ModestAccountMgr instance
+ * @account_name: The name of a server account.
+ *
+ * Gets the hostname this server account.
+ *
+ * Returns: The hostname.
+ */
+gchar*
+modest_server_account_get_hostname (ModestAccountMgr *self, const gchar* account_name);
+
+
 /**
  * modest_server_account_get_secure_auth:
  * @self: a ModestAccountMgr instance
@@ -239,7 +326,7 @@ gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self,
  *
  * Returns: The secure authentication enum value.
  */
-ModestProtocol
+ModestSecureAuthentication
 modest_server_account_get_secure_auth (ModestAccountMgr *self, const gchar* account_name);
 
 /**
@@ -252,7 +339,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);
+	ModestSecureAuthentication secure_auth);
 	
 /**
  * modest_server_account_data_get_security:
@@ -263,7 +350,7 @@ modest_server_account_set_secure_auth (ModestAccountMgr *self, const gchar* acco
  *
  * Returns: The security enum value.
  */
-ModestProtocol
+ModestSecureConnection
 modest_server_account_get_security (ModestAccountMgr *self, const gchar* account_name);
 
 /**
@@ -275,7 +362,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);
+	ModestSecureConnection security);
 
 ModestServerAccountData*
 modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name);
@@ -283,37 +370,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