X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.h;h=d5b020e88dd48e68137ff045f7d9d3c86bfa44d6;hp=0b6873c5432a1ce8bebc9a657e99a53f85cc1222;hb=99e438caf4679a1daf2060f73fb5a97408fca388;hpb=7a031ac6f28832a215e300bece7edcd010377b6c

diff --git a/src/modest-account-mgr-helpers.h b/src/modest-account-mgr-helpers.h
index 0b6873c..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
@@ -298,12 +316,31 @@ modest_server_account_set_username_has_succeeded (ModestAccountMgr *self, const
  * @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:
@@ -327,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);
 
 /**
@@ -340,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:
@@ -351,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);
 
 /**
@@ -363,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);
@@ -371,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